fix: path in scripts

Author: shortcuts

package.json

@@ -25,8 +25,8 @@
     "scripts:build": "yarn workspace scripts build",
     "scripts:lint": "yarn workspace scripts lint",
     "scripts:test": "yarn workspace scripts test",
-    "specs:fix": "eslint --ext=yml specs/$0 --fix",
-    "specs:lint": "eslint --ext=yml specs/$0",
+    "specs:fix": "eslint --ext=yml $0 --fix",
+    "specs:lint": "eslint --ext=yml $0",
     "website": "cd website && yarn start",
     "website:build": "bash scripts/website/build.sh"
   },

scripts/ci/codegen/pushToRepository.ts

@@ -31,7 +31,7 @@ async function handleSpecFiles(spec: SpecsToPush, tempGitDir: string): Promise<v
   await run(`cp ${toAbsolutePath('docs/bundled/*.yml')} ${pathToSpecs}`);
   await run(`cp ${toAbsolutePath('docs/versions-history-with-sla-and-support-policy.json')} ${pathToSpecs}`);
   // adblock extensions ban words like `analytics` so we use a different file name just so the doc dans render it
-  await run(`mv ${pathToSpecs}/analytics.doc.yml ${pathToSpecs}/searchstats.doc.yml`);
+  await run(`mv ${pathToSpecs}/analytics.yml ${pathToSpecs}/searchstats.yml`);
 }
 
 async function handleGuideFiles(guide: GuidesToPush, tempGitDir: string): Promise<void> {

scripts/specs/format.ts

@@ -26,7 +26,7 @@ export async function lintCommon(useCache: boolean): Promise<void> {
     return;
   }
 
-  await run('yarn specs:lint common');
+  await run('yarn specs:lint specs/common');
 
   if (useCache) {
     spinner.text = 'storing common spec cache';

scripts/specs/index.ts

@@ -75,11 +75,12 @@ async function buildSpec({
   const specBase = isLiteSpec ? 'search' : spec;
   const deps = isLiteSpec ? ['search', 'recommend'] : [spec];
   const logSuffix = docs ? 'doc spec' : 'spec';
+  const basePath = docs ? 'docs/' : 'specs/';
   const cache = new Cache({
-    folder: toAbsolutePath('specs/'),
-    generatedFiles: [docs ? `bundled/${spec}.doc.yml` : `bundled/${spec}.yml`],
+    folder: toAbsolutePath(basePath),
+    generatedFiles: [`${spec}.yml`],
     filesToCache: [...deps, 'common'],
-    cacheFile: toAbsolutePath(`specs/dist/${spec}.${docs ? 'doc.' : ''}cache`),
+    cacheFile: toAbsolutePath(`${basePath}/dist/${spec}.cache`),
   });
 
   const spinner = createSpinner(`starting '${spec}' ${logSuffix}`);
@@ -97,10 +98,10 @@ async function buildSpec({
 
   // First linting the base
   spinner.text = `linting '${spec}' ${logSuffix}`;
-  await run(`yarn specs:fix ${specBase}`);
+  await run(`yarn specs:fix specs/${specBase}`);
 
   // Then bundle the file
-  const bundledPath = toAbsolutePath(`specs/bundled/${spec}.${docs ? 'doc.' : ''}${outputFormat}`);
+  const bundledPath = toAbsolutePath(`${basePath}/bundled/${spec}.${outputFormat}`);
   await run(`yarn openapi bundle specs/${specBase}/spec.yml -o ${bundledPath} --ext ${outputFormat}`);
 
   if (!(await exists(bundledPath))) {
@@ -123,7 +124,7 @@ async function buildSpec({
   await run(`yarn openapi lint ${bundledPath}`);
 
   spinner.text = `linting '${spec}' ${logSuffix}`;
-  await run(`yarn specs:fix bundled/${spec}.${docs ? 'doc.' : ''}${outputFormat}`);
+  await run(`yarn specs:fix ${basePath}/bundled/${spec}.${outputFormat}`);
 
   if (useCache) {
     spinner.text = `storing '${spec}' ${logSuffix}`;