[search] Rename cubing/solve to cubing/search.

The latter encompasses the former.
If/when we support ACube/`twsearch` style features, `search` will be more relevant.

.gitignore

@@ -17,6 +17,6 @@
 /puzzle-geometry
 /puzzles
 /scramble
-/solve
+/search
 /stream
 /twisty

Makefile

@@ -2,7 +2,7 @@
 # https://github.com/lgarron/Makefile-scripts
 
 # Note: the first command becomes the default `make` target.
-NPM_COMMANDS = build build-esm build-bundle-global build-types build-bin build-experiments build-solve-worker generate-js generate-js-parsers generate-js-svg dev clean test test-dist-esm-node-import test-dist-esm-parcel test-dist-esm-perf test-dist-experiments test-import-restrictions test-jest test-tsc format setup lint prepack parcel-build-for-twizzle-net
+NPM_COMMANDS = build build-esm build-bundle-global build-types build-bin build-experiments build-search-worker generate-js generate-js-parsers generate-js-svg dev clean test test-dist-esm-node-import test-dist-esm-parcel test-dist-esm-perf test-dist-experiments test-import-restrictions test-jest test-tsc format setup lint prepack parcel-build-for-twizzle-net
 
 .PHONY: $(NPM_COMMANDS)
 $(NPM_COMMANDS):

package.json

@@ -44,12 +44,12 @@
     "build-types": "node ./script/build/main.js types",
     "build-bin": "node ./script/build/main.js bin",
     "build-experiments": "node ./script/build/main.js snowpack",
-    "build-solve-worker": "node ./script/build/main.js solve-worker",
+    "build-search-worker": "node ./script/build/main.js search-worker",
     "generate-js": "npm run generate-js-parsers && npm run generate-js-svg",
     "generate-js-parsers": "npx peggy --format es src/cubing/kpuzzle/parser/parser-peggy.peggy",
     "generate-js-svg": "echo \"TODO: Generating JS for SVGs is not implemented yet.\"",
     "dev": "node ./script/build/main.js snowpack dev",
-    "clean": "rm -rf dist .cache .parcel-cache coverage .rpt2_cache /tmp/cubing-js-parcel src/cubing/solve/worker-inside-generated* script/dist-test/parcel-test/parcel-package/.parcel-cache script/dist-test/parcel-test/parcel-package/dist script/dist-test/parcel-test/parcel-package/node_modules  ./alg ./bluetooth ./kpuzzle ./notation ./protocol ./puzzle-geometry ./puzzles ./scramble ./solve ./stream ./twisty",
+    "clean": "rm -rf dist .cache .parcel-cache coverage .rpt2_cache /tmp/cubing-js-parcel src/cubing/search/worker-inside-generated* script/dist-test/parcel-test/parcel-package/.parcel-cache script/dist-test/parcel-test/parcel-package/dist script/dist-test/parcel-test/parcel-package/node_modules  ./alg ./bluetooth ./kpuzzle ./notation ./protocol ./puzzle-geometry ./puzzles ./scramble ./search ./stream ./twisty",
     "test": "npm run test-jest && npm run lint && npm run test-import-restrictions && npm run test-tsc # keep test.yml in sync with this",
     "test-dist-esm-node-import": "node script/test/dist/esm/node-import/main.mjs",
     "test-dist-esm-parcel": "node ./script/test/dist/esm/parcel/main.js",
@@ -117,8 +117,8 @@
       "/dist",
       "/src/static",
       "/snowpack.config.mjs",
-      "/src/cubing/solve/inside/solve/vendor/min2phase/gwt.js",
-      "/src/cubing/solve/worker-inside-generated*",
+      "/src/cubing/search/inside/solve/vendor/min2phase/gwt.js",
+      "/src/cubing/search/worker-inside-generated*",
       "/script/test/dist/esm/parcel/parcel-package/**/*",
       "/*/index.d.ts",
       "parser-peggy.js"
@@ -172,9 +172,9 @@
       "import": "./dist/esm/scramble/index.js",
       "types": "./dist/types/scramble/index.d.ts"
     },
-    "./solve": {
-      "import": "./dist/esm/solve/index.js",
-      "types": "./dist/types/solve/index.d.ts"
+    "./search": {
+      "import": "./dist/esm/search/index.js",
+      "types": "./dist/types/search/index.d.ts"
     },
     "./stream": {
       "import": "./dist/esm/stream/index.js",

script/build/main.js

@@ -56,12 +56,12 @@ function constructStringWrappingPlugin(dev) {
         return new Promise(async (resolve, _) => {
           if (result.errors.length !== 0) {
             await execPromise(
-              "rm -f src/cubing/solve/worker-inside-generated.js",
+              "rm -f src/cubing/search/worker-inside-generated.js",
             );
 
             if (dev) {
               writeFile(
-                "src/cubing/solve/worker-inside-generated-string.js",
+                "src/cubing/search/worker-inside-generated-string.js",
                 'export const workerSource = "throw new Error(\\"Worker build error.\\");";',
                 () => {
                   console.log(
@@ -72,26 +72,26 @@ function constructStringWrappingPlugin(dev) {
               );
             } else {
               await execPromise(
-                "rm -f src/cubing/solve/worker-inside-generated-string.js",
+                "rm -f src/cubing/search/worker-inside-generated-string.js",
               );
               console.log(
                 "Worker generation failed. Removed generated worker files.",
               );
             }
           } else {
             readFile(
-              "src/cubing/solve/worker-inside-generated.js",
+              "src/cubing/search/worker-inside-generated.js",
               "utf8",
               (_, contents) => {
                 writeFile(
-                  "src/cubing/solve/worker-inside-generated-string.js",
+                  "src/cubing/search/worker-inside-generated-string.js",
                   `export const workerSource = "${contents
                     .replace(/\\/g, "\\\\")
                     .replace(/"/g, '\\"')
                     .replace(/\n/g, "\\n")}";`,
                   async () => {
                     await execPromise(
-                      "rm -f src/cubing/solve/worker-inside-generated.js",
+                      "rm -f src/cubing/search/worker-inside-generated.js",
                     );
                     console.log("updated worker-inside-generated-string.js");
                     resolve();
@@ -106,14 +106,14 @@ function constructStringWrappingPlugin(dev) {
   };
 }
 
-export const solveWorkerTarget = {
-  name: "solve-worker",
+export const searchWorkerTarget = {
+  name: "search-worker",
   builtYet: false,
   dependencies: [],
   buildSelf: (dev) => {
     return esbuild.build({
-      entryPoints: ["./src/cubing/solve/inside/entry.js"],
-      outfile: "./src/cubing/solve/worker-inside-generated.js",
+      entryPoints: ["./src/cubing/search/inside/entry.js"],
+      outfile: "./src/cubing/search/worker-inside-generated.js",
       format: "cjs",
       target: "es2015",
       bundle: true,
@@ -129,7 +129,7 @@ export const solveWorkerTarget = {
 export const bundleGlobalTarget = {
   name: "bundle-global",
   builtYet: false,
-  dependencies: [solveWorkerTarget],
+  dependencies: [searchWorkerTarget],
   buildSelf: (dev) => {
     return esbuild.build({
       entryPoints: ["src/cubing/cubing.bundle-global.ts"],
@@ -148,7 +148,7 @@ export const bundleGlobalTarget = {
 export const esmTarget = {
   name: "esm",
   builtYet: false,
-  dependencies: [solveWorkerTarget],
+  dependencies: [searchWorkerTarget],
   buildSelf: async (dev) => {
     await esbuild.build({
       entryPoints: [
@@ -161,7 +161,7 @@ export const esmTarget = {
         "src/cubing/puzzles/index.ts",
         "src/cubing/scramble/index.ts",
         "src/cubing/stream/index.ts",
-        "src/cubing/solve/index.ts",
+        "src/cubing/search/index.ts",
         "src/cubing/twisty/index.ts",
         "src/cubing/esm-test-worker.js",
       ],
@@ -183,7 +183,7 @@ export const esmTarget = {
 export const binTarget = {
   name: "bin",
   builtYet: false,
-  dependencies: [solveWorkerTarget],
+  dependencies: [searchWorkerTarget],
   buildSelf: async (dev) => {
     await esbuild.build({
       entryPoints: ["src/bin/puzzle-geometry-bin.ts"],
@@ -203,7 +203,7 @@ export const binTarget = {
 export const SnowpackTarget = {
   name: "snowpack",
   builtYet: false,
-  dependencies: [solveWorkerTarget],
+  dependencies: [searchWorkerTarget],
   buildSelf: async (dev) => {
     const config = snowpack.createConfiguration(configSrc);
 
@@ -214,7 +214,7 @@ export const SnowpackTarget = {
 
     // if (!dev) {
     //   await execPromise(
-    //     "cp src/cubing/solve/esm-test-worker.js dist/experiments/esm-test-worker.js",
+    //     "cp src/cubing/search/esm-test-worker.js dist/experiments/esm-test-worker.js",
     //   );
     // }
   },
@@ -223,7 +223,7 @@ export const SnowpackTarget = {
 export const typesTarget = {
   name: "types",
   builtYet: false,
-  dependencies: [solveWorkerTarget], // solve worker?
+  dependencies: [searchWorkerTarget],
   buildSelf: async (dev) => {
     console.warn(
       "Note: The `types` target uses `tsc`, which is slow. Expect ≈10 seconds or more.",
@@ -255,7 +255,7 @@ if (!targetName) {
 const dev = process.argv[3] === "dev";
 
 const targets /*: Record<String, SolverWorker>*/ = {
-  "solve-worker": solveWorkerTarget,
+  "search-worker": searchWorkerTarget,
   "snowpack": SnowpackTarget,
   "bundle-global": bundleGlobalTarget,
   "esm": esmTarget,

script/test/dist/esm/node-import/test.mjs

@@ -6,7 +6,7 @@ import "cubing/protocol";
 import "cubing/puzzle-geometry";
 import "cubing/puzzles";
 import "cubing/scramble";
-import "cubing/solve";
+import "cubing/search";
 import "cubing/stream";
 import "cubing/twisty";
 

script/test/import-restrictions/main.js

@@ -111,7 +111,7 @@ for (const [name, targetInfo] of Object.entries(targetInfos)) {
 // targets.map(a => console.log(a.dirPath))
 
 (async () => {
-  await execPromise("make build-solve-worker");
+  await execPromise("make build-search-worker");
   for (const currentTarget of targets) {
     build({
       target: "es2020",

script/test/import-restrictions/target-infos.js

@@ -52,11 +52,11 @@ export const targetInfos = {
   },
   "scramble": {
     deps: {
-      direct: ["alg", "solve"],
+      direct: ["alg", "search"],
       dynamic: [],
     },
   },
-  "solve": {
+  "search": {
     deps: {
       direct: ["alg", "kpuzzle", "puzzles"],
       dynamic: [],

src/cubing/cubing.bundle-global.ts

@@ -7,7 +7,7 @@ import * as puzzleGeometry from "./puzzle-geometry";
 import * as puzzles from "./puzzles";
 import * as scramble from "./scramble";
 import * as stream from "./stream";
-import * as solve from "./solve";
+import * as search from "./search";
 import * as twisty from "./twisty";
 
 export const cubing = {
@@ -20,7 +20,7 @@ export const cubing = {
   puzzles,
   scramble,
   stream,
-  solve,
+  search,
   twisty,
 };
 

src/cubing/esm-test-worker.js

@@ -2,4 +2,4 @@
 // But due to `esbuild` chunking, we have to put it in the root folder.
 // Remove this file once https://github.com/evanw/esbuild/issues/312 is implemented.
 
-import "./solve/esm-test-worker";
+import "./search/esm-test-worker";

src/cubing/scramble/index.ts

@@ -1 +1 @@
-export { experimentalRandomScrambleForEvent as randomScrambleForEvent } from "../solve";
+export { experimentalRandomScrambleForEvent as randomScrambleForEvent } from "../search";

src/experiments/alg.cubing.net/app.ts

@@ -19,7 +19,7 @@ import {
   solveMegaminx,
   solvePyraminx,
   solveSkewb,
-} from "../../cubing/solve";
+} from "../../cubing/search";
 import { cube2x2x2KPuzzle } from "../../cubing/puzzles/implementations/2x2x2/2x2x2.kpuzzle.json_";
 import { randomScrambleForEvent } from "../../cubing/scramble";
 

src/static/dist/esm/search/index.d.ts

@@ -0,0 +1 @@
+export * from "../../types/search";

src/static/search/index.d.ts

@@ -0,0 +1 @@
+export * from "../dist/types/search";

src/static/search/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "search",
+  "type": "module",
+  "main": "../dist/esm/search/index.js",
+  "types": "../dist/types/search/index.d.ts"
+}

tsconfig.json

@@ -24,7 +24,7 @@
     "*/index.d.ts",
     "src/static/**/*",
     "src/**/*.spec.ts",
-    "src/cubing/solve/worker-inside-generated*",
-    "src/cubing/solve/inside/solve/vendor/min2phase/gwt.js"
+    "src/cubing/search/worker-inside-generated*",
+    "src/cubing/search/inside/solve/vendor/min2phase/gwt.js"
   ]
 }