@simplysm/sd-cli 10.0.66 → 11.0.3

package/dist/build-cluster.js

@@ -40,9 +40,10 @@ if (cluster.isPrimary) {
 }
 else {
     const message = JSON.parse(process.env["SD_CLUSTER_MESSAGE"]);
+    const pkgConf = message.projConf.packages[path.basename(message.pkgPath)];
     if (message.cmd === "watch") {
         // [library] javascript
-        if (message.pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
             if (message.withLint) {
                 await new SdCliJsLibLinter(message.pkgPath)
                     .on("change", () => {
@@ -66,8 +67,8 @@ else {
             });
         }
         // [library] typescript
-        else if (message.pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-            await new SdCliTsLibBuilder(message.pkgPath, message.pkgConf, message.withLint)
+        else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+            await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint)
                 .on("change", () => {
                 sendMessage({
                     type: "change",
@@ -88,8 +89,8 @@ else {
             });
         }
         // [server]
-        else if (message.pkgConf.type === "server") {
-            await new SdCliServerBuilder(message.pkgPath, message.pkgConf, message.withLint)
+        else if (pkgConf.type === "server") {
+            await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint)
                 .on("change", () => {
                 sendMessage({
                     type: "change",
@@ -110,8 +111,8 @@ else {
             });
         }
         // [client]
-        else if (message.pkgConf.type === "client") {
-            await new SdCliClientBuilder(message.pkgPath, message.pkgConf, message.builderKey ?? "web", message.withLint)
+        else if (pkgConf.type === "client") {
+            await new SdCliClientBuilder(message.projConf, message.pkgPath)
                 .on("change", () => {
                 sendMessage({
                     type: "change",
@@ -137,7 +138,7 @@ else {
     }
     else { // build
         // [library] javascript
-        if (message.pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+        if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
             if (message.withLint) {
                 const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
                 sendMessage({
@@ -155,8 +156,8 @@ else {
             }
         }
         // [library] typescript
-        else if (message.pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-            const result = await new SdCliTsLibBuilder(message.pkgPath, message.pkgConf, message.withLint).buildAsync();
+        else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
+            const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
             sendMessage({
                 type: "complete",
                 result,
@@ -164,8 +165,8 @@ else {
             });
         }
         // [server]
-        else if (message.pkgConf.type === "server") {
-            const result = await new SdCliServerBuilder(message.pkgPath, message.pkgConf, message.withLint).buildAsync();
+        else if (pkgConf.type === "server") {
+            const result = await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
             sendMessage({
                 type: "complete",
                 result,
@@ -173,8 +174,8 @@ else {
             });
         }
         // [client]
-        else if (message.pkgConf.type === "client") {
-            const result = await new SdCliClientBuilder(message.pkgPath, message.pkgConf, message.builderKey ?? "web", message.withLint).buildAsync();
+        else if (pkgConf.type === "client") {
+            const result = await new SdCliClientBuilder(message.projConf, message.pkgPath).buildAsync();
             sendMessage({
                 type: "complete",
                 result,

package/dist/build-cluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-cluster.js","sourceRoot":"","sources":["../src/build-cluster.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,wBAAwB,CAAC;AACtE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAEjE,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE;IACpC,MAAM,CAAC,SAAS,CAAC;QACf,OAAO,EAAE;YACP,KAAK,EAAE,cAAc,CAAC,KAAK;SAC5B;KACF,CAAC,CAAC;CACJ;KACI;IACH,MAAM,CAAC,SAAS,CAAC;QACf,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;AAEnE,IAAI,OAAO,CAAC,SAAS,EAAE;IACrB,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;IAE1C,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,cAAc,IAAI,GAAG,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACxC,WAAW,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC;YACX,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,IAAK,CAAC,OAAO,CAAC,CAAC;CACxB;KACI;IACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAE,CAAiC,CAAC;IAE/F,IAAI,OAAO,CAAC,GAAG,KAAK,OAAO,EAAE;QAC3B,uBAAuB;QACvB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YACxG,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;qBACxC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;oBACjB,WAAW,CAAC;wBACV,IAAI,EAAE,QAAQ;wBACd,GAAG,EAAE,OAAO;qBACb,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;oBACzB,WAAW,CAAC;wBACV,IAAI,EAAE,UAAU;wBAChB,MAAM;wBACN,GAAG,EAAE,OAAO;qBACb,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,UAAU,EAAE,CAAC;aACjB;YACD,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,uBAAuB;aAClB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YAC5G,MAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;iBAC5E,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;iBAC7E,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC;iBAC1G,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;aACI;YACH,MAAM,IAAI,eAAe,EAAE,CAAC;SAC7B;KACF;SACI,EAAE,QAAQ;QACb,uBAAuB;QACvB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YACxG,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;gBACxE,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;aACJ;iBACI;gBACH,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,SAAS;oBACjB,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;aACJ;SACF;QACD,uBAAuB;aAClB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YAC5G,MAAM,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;YAC5G,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;YAC7G,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;YAC1I,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;aACI;YACH,MAAM,IAAI,eAAe,EAAE,CAAC;SAC7B;KACF;CACF;AAED,SAAS,WAAW,CAAC,OAAqC;IACxD,OAAO,CAAC,IAAK,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"build-cluster.js","sourceRoot":"","sources":["../src/build-cluster.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAC,MAAM,wBAAwB,CAAC;AACtE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAC,eAAe,EAAC,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAEjE,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,EAAE;IACpC,MAAM,CAAC,SAAS,CAAC;QACf,OAAO,EAAE;YACP,KAAK,EAAE,cAAc,CAAC,KAAK;SAC5B;KACF,CAAC,CAAC;CACJ;KACI;IACH,MAAM,CAAC,SAAS,CAAC;QACf,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;AAEnE,IAAI,OAAO,CAAC,SAAS,EAAE;IACrB,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC5C,MAAM,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;IAE1C,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAClC,MAAM,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,cAAc,IAAI,GAAG,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACxC,WAAW,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC;YACX,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,IAAK,CAAC,OAAO,CAAC,CAAC;CACxB;KACI;IACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAE,CAAiC,CAAC;IAC/F,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAE,CAAC;IAE3E,IAAI,OAAO,CAAC,GAAG,KAAK,OAAO,EAAE;QAC3B,uBAAuB;QACvB,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YAChG,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;qBACxC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;oBACjB,WAAW,CAAC;wBACV,IAAI,EAAE,QAAQ;wBACd,GAAG,EAAE,OAAO;qBACb,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;oBACzB,WAAW,CAAC;wBACV,IAAI,EAAE,UAAU;wBAChB,MAAM;wBACN,GAAG,EAAE,OAAO;qBACb,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,UAAU,EAAE,CAAC;aACjB;YACD,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,uBAAuB;aAClB,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YACpG,MAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;iBAC7E,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;iBAC9E,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;iBAC5D,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACjB,WAAW,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;gBACzB,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,UAAU,EAAE,CAAC;YAChB,WAAW,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;aACI;YACH,MAAM,IAAI,eAAe,EAAE,CAAC;SAC7B;KACF;SACI,EAAE,QAAQ;QACb,uBAAuB;QACvB,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YAChG,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;gBACxE,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;aACJ;iBACI;gBACH,WAAW,CAAC;oBACV,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,SAAS;oBACjB,GAAG,EAAE,OAAO;iBACb,CAAC,CAAC;aACJ;SACF;QACD,uBAAuB;aAClB,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE;YACpG,MAAM,MAAM,GAAG,MAAM,IAAI,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;YAC7G,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;YAC9G,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;QACD,WAAW;aACN,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;YAClC,MAAM,MAAM,GAAG,MAAM,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;YAC5F,WAAW,CAAC;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,GAAG,EAAE,OAAO;aACb,CAAC,CAAC;SACJ;aACI;YACH,MAAM,IAAI,eAAe,EAAE,CAAC;SAC7B;KACF;CACF;AAED,SAAS,WAAW,CAAC,OAAqC;IACxD,OAAO,CAAC,IAAK,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}

package/dist/build-tools/SdTsIncrementalBuilder.d.ts

@@ -10,6 +10,8 @@ export declare class SdTsIncrementalBuilder {
     private readonly _host;
     private readonly _opt;
     builderProgram?: ts.SemanticDiagnosticsBuilderProgram;
+    private _program?;
+    private _ngProgram?;
     private readonly _writeFileCache;
     constructor(_pkgPath: string, _compilerOptions: ts.CompilerOptions, _host: ts.CompilerHost, _opt: {
         emitJs: boolean | string[];

package/dist/build-tools/SdTsIncrementalBuilder.js

@@ -2,6 +2,8 @@ import path from "path";
 import ts from "typescript";
 import { SdCliBuildResultUtil } from "../utils/SdCliBuildResultUtil";
 import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { NgtscProgram } from "@angular/compiler-cli";
+import { createHash } from "crypto";
 export class SdTsIncrementalBuilder {
     constructor(_pkgPath, _compilerOptions, _host, _opt) {
         this._pkgPath = _pkgPath;
@@ -12,7 +14,8 @@ export class SdTsIncrementalBuilder {
     }
     static async createAsync(pkgPath, optFn) {
         const tsConfigFilePath = path.resolve(pkgPath, "tsconfig.json");
-        const parsedTsConfig = ts.parseJsonConfigFileContent(await FsUtil.readJsonAsync(tsConfigFilePath), ts.sys, pkgPath);
+        const tsConfig = await FsUtil.readJsonAsync(tsConfigFilePath);
+        const parsedTsConfig = ts.parseJsonConfigFileContent(await FsUtil.readJsonAsync(tsConfigFilePath), ts.sys, pkgPath, tsConfig["angularCompilerOptions"]);
         const opt = optFn(parsedTsConfig.options);
         const compilerOptions = {
             ...parsedTsConfig.options,
@@ -26,28 +29,70 @@ export class SdTsIncrementalBuilder {
         const distPath = this._compilerOptions.outDir ?? path.resolve(this._pkgPath, "dist");
         const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.{ts,tsx}");
         const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-        this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(srcFilePaths, this._compilerOptions, this._host, this.builderProgram);
+        if (this._compilerOptions["strictTemplates"] === true) {
+            this._ngProgram = new NgtscProgram(srcFilePaths, this._compilerOptions, this._host, this._ngProgram);
+            this._program = this._ngProgram.getTsProgram();
+        }
+        else {
+            this._program = ts.createProgram(srcFilePaths, this._compilerOptions, this._host, this._program);
+        }
+        const baseGetSourceFiles = this._program.getSourceFiles;
+        this._program.getSourceFiles = function (...parameters) {
+            const files = baseGetSourceFiles(...parameters);
+            for (const file of files) {
+                if (file.version === undefined) {
+                    file.version = createHash("sha256").update(file.text).digest("hex");
+                }
+            }
+            return files;
+        };
+        this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(this._program, this._host, this.builderProgram);
         const diagnostics = [];
         const affectedFilePaths = [];
+        if (this._ngProgram) {
+            diagnostics.push(...this._ngProgram.compiler.getOptionDiagnostics());
+        }
         diagnostics.push(...this.builderProgram.getOptionsDiagnostics(), ...this.builderProgram.getGlobalDiagnostics());
+        if (this._ngProgram) {
+            await this._ngProgram.compiler.analyzeAsync();
+        }
         const program = this.builderProgram.getProgram();
         logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리중...`);
         const srcFilePathSet = new Set(srcFilePaths);
         while (true) {
+            let affectedSourceFile;
             const semanticResult = this.builderProgram.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
-                return !srcFilePathSet.has(path.resolve(sourceFile.fileName));
+                //-- ngtypecheck의 org파일 포함 (ngtypecheck 파일는 무시)
+                if (this._ngProgram?.compiler.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
+                    const orgFileName = sourceFile.fileName.slice(0, -15) + ".ts";
+                    const orgSourceFile = this.builderProgram.getSourceFile(orgFileName);
+                    if (orgSourceFile) {
+                        affectedSourceFile = orgSourceFile;
+                    }
+                    return true;
+                }
+                //-- 소스폴더 파일 포함
+                else if (srcFilePathSet.has(path.resolve(sourceFile.fileName))) {
+                    affectedSourceFile = sourceFile;
+                    return false;
+                }
+                //-- 나머지 무시
+                else {
+                    return true;
+                }
             });
-            if (!semanticResult)
+            if (!semanticResult || !affectedSourceFile)
                 break;
             diagnostics.push(...semanticResult.result);
-            if ("fileName" in semanticResult.affected) {
-                const emitResult = this.builderProgram.emit(semanticResult.affected, (filePath, data, writeByteOrderMark) => {
+            if ("fileName" in affectedSourceFile) {
+                const emitResult = this.builderProgram.emit(affectedSourceFile, (filePath, data, writeByteOrderMark) => {
                     let realFilePath = filePath;
                     let realData = data;
                     if (PathUtil.isChildPath(realFilePath, path.resolve(distPath, path.basename(this._pkgPath), "src"))) {
                         realFilePath = path.resolve(distPath, path.relative(path.resolve(distPath, path.basename(this._pkgPath), "src"), realFilePath));
                         if (filePath.endsWith(".js.map")) {
                             const sourceMapContents = JSON.parse(realData);
+                            // remove "../../"
                             sourceMapContents.sources[0] = sourceMapContents.sources[0].slice(6);
                             realData = JSON.stringify(sourceMapContents);
                         }
@@ -56,12 +101,18 @@ export class SdTsIncrementalBuilder {
                         this._host.writeFile(realFilePath, realData, writeByteOrderMark);
                     }
                     this._writeFileCache.set(realFilePath, realData);
-                }, undefined, Array.isArray(this._opt.emitJs) ? !this._opt.emitJs.includes(path.resolve(semanticResult.affected.fileName)) : !this._opt.emitJs, this._opt.transforms ? {
+                }, undefined, Array.isArray(this._opt.emitJs) ? !this._opt.emitJs.includes(path.resolve(affectedSourceFile.fileName)) : !this._opt.emitJs, this._opt.transforms ? {
                     before: this._opt.transforms.map((item) => typeof item.fn === "function" ? item.fn(program, item.args) : item.fn["default"](program, item.args))
                 } : undefined);
                 diagnostics.push(...emitResult.diagnostics);
-                diagnostics.push(...this.builderProgram.getSyntacticDiagnostics(semanticResult.affected));
-                affectedFilePaths.push(path.resolve(semanticResult.affected.fileName));
+                diagnostics.push(...this.builderProgram.getSyntacticDiagnostics(affectedSourceFile));
+                if (this._ngProgram &&
+                    !affectedSourceFile.isDeclarationFile &&
+                    !this._ngProgram.compiler.ignoreForEmit.has(affectedSourceFile) &&
+                    !this._ngProgram.compiler.incrementalCompilation.safeToSkipEmit(affectedSourceFile)) {
+                    diagnostics.push(...this._ngProgram.compiler.getDiagnosticsForFile(affectedSourceFile, 1));
+                }
+                affectedFilePaths.push(path.resolve(affectedSourceFile.fileName));
             }
         }
         logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리 완료`, affectedFilePaths);

package/dist/build-tools/SdTsIncrementalBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdTsIncrementalBuilder.js","sourceRoot":"","sources":["../../src/build-tools/SdTsIncrementalBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SdTsIncrementalBuilder.js","sourceRoot":"","sources":["../../src/build-tools/SdTsIncrementalBuilder.ts"],"names":[],"mappings":"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"}

package/dist/builders/SdCliClientBuilder.d.ts

@@ -1,17 +1,16 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { ISdCliBuilderResult, ISdCliClientPackageConfig } from "../commons";
+import { ISdCliBuilderResult, ISdCliConfig } from "../commons";
 export declare class SdCliClientBuilder extends EventEmitter {
+    private readonly _projConf;
     private readonly _pkgPath;
-    private readonly _pkgConf;
-    private readonly _builderKey;
-    private readonly _withLint;
     private readonly _logger;
-    constructor(_pkgPath: string, _pkgConf: ISdCliClientPackageConfig, _builderKey: "web" | "electron", _withLint: boolean);
+    private readonly _pkgConf;
+    constructor(_projConf: ISdCliConfig, _pkgPath: string);
     on(event: "change", listener: () => void): this;
     on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
-    watchAsync(): Promise<number>;
+    watchAsync(): Promise<void>;
     buildAsync(): Promise<ISdCliBuilderResult>;
-    private _getViteConfig;
+    private _getEsBuildOptionsAsync;
     private _debug;
 }