@simplysm/sd-cli 12.5.22 → 12.5.24

package/src/types/workers.type.ts

@@ -1,6 +1,8 @@
 import { ESLint } from "eslint";
 import { ISdTsCompilerResult, SdTsCompilerOptions } from "./ts-compiler.type";
 import { TNormPath } from "@simplysm/sd-core-node";
+import { ISdBuildRunnerWorkerRequest } from "./build-runner.type";
+import { ISdBuildMessage, ISdBuildRunnerResult } from "./build.type";
 
 export interface TServerWorkerType {
   methods: {
@@ -21,7 +23,18 @@ export interface TSdLintWorkerType {
 export interface TSdTsCompileWorkerType {
   methods: {
     initialize: { params: [SdTsCompilerOptions]; returnType: void };
-    compile: { params: [Set<TNormPath>?]; returnType: ISdTsCompilerResult };
+    compile: { params: [Set<TNormPath>]; returnType: ISdTsCompilerResult };
   };
   events: {};
 }
+
+
+export interface TSdBuildRunnerWorkerType {
+  methods: {
+    run: { params: [ISdBuildRunnerWorkerRequest]; returnType: ISdBuildMessage[] | void };
+  };
+  events: {
+    change: void;
+    complete: ISdBuildRunnerResult;
+  };
+}

package/src/workers/build-runner-worker.ts

@@ -0,0 +1,52 @@
+import { createSdWorker, FsUtil, Logger, LoggerSeverity } from "@simplysm/sd-core-node";
+import { ISdBuildMessage } from "../types/build.type";
+import path from "path";
+import { SdServerBuildRunner } from "../pkg-builders/server/SdServerBuildRunner";
+import { SdClientBuildRunner } from "../pkg-builders/client/SdClientBuildRunner";
+import { SdTsLibBuildRunner } from "../pkg-builders/lib/SdTsLibBuildRunner";
+import { SdJsLibBuildRunner } from "../pkg-builders/lib/SdJsLibBuildRunner";
+import { TSdBuildRunnerWorkerType } from "../types/workers.type";
+import { ISdBuildRunnerWorkerRequest } from "../types/build-runner.type";
+import { EventEmitter } from "events";
+
+Error.stackTraceLimit = Infinity;
+EventEmitter.defaultMaxListeners = 0;
+
+if (process.env["SD_DEBUG"] != null) {
+  Logger.setConfig({
+    console: {
+      level: LoggerSeverity.debug,
+    },
+  });
+} else {
+  Logger.setConfig({
+    dot: true,
+  });
+}
+
+const worker = createSdWorker<TSdBuildRunnerWorkerType>({
+  async run(req: ISdBuildRunnerWorkerRequest): Promise<ISdBuildMessage[] | void> {
+    const pkgConf = req.projConf.packages[path.basename(req.pkgPath)]!;
+
+    const buildRunnerType =
+      pkgConf.type === "server"
+        ? SdServerBuildRunner
+        : pkgConf.type === "client"
+          ? SdClientBuildRunner
+          : FsUtil.exists(path.resolve(req.pkgPath, "tsconfig.json"))
+            ? SdTsLibBuildRunner
+            : SdJsLibBuildRunner;
+
+    const builder = new buildRunnerType(req.projConf, req.pkgPath)
+      .on("change", () => worker.send("change"))
+      .on("complete", (result) => worker.send("complete", result));
+
+    if (req.cmd === "build") {
+      const res = await builder.buildAsync();
+      return res.buildMessages;
+    } else {
+      await builder.watchAsync();
+      return;
+    }
+  },
+});

package/tsconfig.json

@@ -8,7 +8,7 @@
   "files": [
     "./src/index.ts",
     "./src/sd-cli.ts",
-    "./src/workers/compile-worker.ts",
+    "./src/workers/build-runner-worker.ts",
     "./src/workers/lint-worker.ts",
     "./src/workers/server-worker.ts"
   ]

package/dist/ts-builder/SdTsCompileWorker.d.ts

@@ -1,9 +0,0 @@
-import { TNormPath } from "@simplysm/sd-core-node";
-import { SdTsCompilerOptions } from "../types/ts-compiler.type";
-export declare class SdTsCompileWorker {
-    private _compileProc;
-    private _pkgPath;
-    static new(opt: SdTsCompilerOptions): Promise<SdTsCompileWorker>;
-    private constructor();
-    compileAsync(modifiedFileSet?: Set<TNormPath>): Promise<import("../types/ts-compiler.type").ISdTsCompilerResult>;
-}

package/dist/ts-builder/SdTsCompileWorker.js

@@ -1,16 +0,0 @@
-import { SdWorker } from "@simplysm/sd-core-node";
-export class SdTsCompileWorker {
-    static async new(opt) {
-        const compileWorker = new SdWorker(import.meta.resolve("../workers/compile-worker"));
-        await compileWorker.run("initialize", [opt]);
-        return new SdTsCompileWorker(compileWorker, opt.pkgPath);
-    }
-    constructor(_compileProc, _pkgPath) {
-        this._compileProc = _compileProc;
-        this._pkgPath = _pkgPath;
-    }
-    async compileAsync(modifiedFileSet) {
-        return await this._compileProc.run("compile", [modifiedFileSet]);
-    }
-}
-//# sourceMappingURL=SdTsCompileWorker.js.map

package/dist/ts-builder/SdTsCompileWorker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SdTsCompileWorker.js","sourceRoot":"","sources":["../../src/ts-builder/SdTsCompileWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AAI7D,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAwB;QACvC,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAyB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAC7G,MAAM,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,iBAAiB,CAAC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,YACU,YAA8C,EAC9C,QAAgB;QADhB,iBAAY,GAAZ,YAAY,CAAkC;QAC9C,aAAQ,GAAR,QAAQ,CAAQ;IACvB,CAAC;IAEG,KAAK,CAAC,YAAY,CAAC,eAAgC;QACxD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IACnE,CAAC;CACF"}

package/dist/workers/compile-worker.js

@@ -1,27 +0,0 @@
-import { createSdWorker, Logger, LoggerSeverity } from "@simplysm/sd-core-node";
-import { EventEmitter } from "events";
-import { SdTsCompiler } from "../ts-builder/SdTsCompiler";
-Error.stackTraceLimit = Infinity;
-EventEmitter.defaultMaxListeners = 0;
-if (process.env["SD_DEBUG"] != null) {
-    Logger.setConfig({
-        console: {
-            level: LoggerSeverity.debug,
-        },
-    });
-}
-else {
-    Logger.setConfig({
-        dot: true,
-    });
-}
-let compiler;
-createSdWorker({
-    initialize(opt) {
-        compiler = new SdTsCompiler(opt);
-    },
-    async compile(modifiedFileSet) {
-        return await compiler.compileAsync(modifiedFileSet);
-    },
-});
-//# sourceMappingURL=compile-worker.js.map

package/dist/workers/compile-worker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compile-worker.js","sourceRoot":"","sources":["../../src/workers/compile-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAa,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI1D,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,MAAM,CAAC,SAAS,CAAC;QACf,OAAO,EAAE;YACP,KAAK,EAAE,cAAc,CAAC,KAAK;SAC5B;KACF,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,MAAM,CAAC,SAAS,CAAC;QACf,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,IAAI,QAAsB,CAAC;AAE3B,cAAc,CAAyB;IACrC,UAAU,CAAC,GAAwB;QACjC,QAAQ,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,eAAgC;QAC5C,OAAO,MAAM,QAAQ,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IACtD,CAAC;CACF,CAAC,CAAC"}

package/lib/dev-worker.cjs

@@ -1,5 +0,0 @@
-const tsx = require("tsx/cjs/api");
-const { workerData } = require("piscina");
-
-tsx.register();
-module.exports = require(workerData.__file__);

package/src/ts-builder/SdTsCompileWorker.ts

@@ -1,21 +0,0 @@
-import { SdWorker, TNormPath } from "@simplysm/sd-core-node";
-import { TSdTsCompileWorkerType } from "../types/workers.type";
-import { SdTsCompilerOptions } from "../types/ts-compiler.type";
-
-export class SdTsCompileWorker {
-  static async new(opt: SdTsCompilerOptions) {
-    const compileWorker = new SdWorker<TSdTsCompileWorkerType>(import.meta.resolve("../workers/compile-worker"));
-    await compileWorker.run("initialize", [opt]);
-
-    return new SdTsCompileWorker(compileWorker, opt.pkgPath);
-  }
-
-  private constructor(
-    private _compileProc: SdWorker<TSdTsCompileWorkerType>,
-    private _pkgPath: string,
-  ) {}
-
-  public async compileAsync(modifiedFileSet?: Set<TNormPath>) {
-    return await this._compileProc.run("compile", [modifiedFileSet]);
-  }
-}

package/src/workers/compile-worker.ts

@@ -1,31 +0,0 @@
-import { createSdWorker, Logger, LoggerSeverity, TNormPath } from "@simplysm/sd-core-node";
-import { EventEmitter } from "events";
-import { SdTsCompiler } from "../ts-builder/SdTsCompiler";
-import { TSdTsCompileWorkerType } from "../types/workers.type";
-import { SdTsCompilerOptions } from "../types/ts-compiler.type";
-
-Error.stackTraceLimit = Infinity;
-EventEmitter.defaultMaxListeners = 0;
-
-if (process.env["SD_DEBUG"] != null) {
-  Logger.setConfig({
-    console: {
-      level: LoggerSeverity.debug,
-    },
-  });
-} else {
-  Logger.setConfig({
-    dot: true,
-  });
-}
-
-let compiler: SdTsCompiler;
-
-createSdWorker<TSdTsCompileWorkerType>({
-  initialize(opt: SdTsCompilerOptions) {
-    compiler = new SdTsCompiler(opt);
-  },
-  async compile(modifiedFileSet?: Set<TNormPath>) {
-    return await compiler.compileAsync(modifiedFileSet);
-  },
-});