@player-tools/cli 0.7.0-next.6 → 0.7.0-next.7

package/dist/commands/dsl/compile.js

@@ -74,9 +74,10 @@ class DSLCompile extends base_command_1.BaseCommand {
                 return;
             }
             const preProcessedValue = await context.dslCompiler.hooks.preProcessFlow.call(defaultExport);
-            const contentType = (await context.hooks.identifyContentType.call(file, preProcessedValue)) ||
-                (0, dsl_1.fingerprintContent)(preProcessedValue, file) ||
-                "unknown";
+            const { type: contentType, extension: ext } = (await context.hooks.identifyContentType.call(file, preProcessedValue)) || {
+                type: (0, dsl_1.fingerprintContent)(preProcessedValue, file) || "unknown",
+                extension: ".json",
+            };
             let relativePath = path_1.default.relative(input, file);
             if (!relativePath) {
                 relativePath = path_1.default.basename(file);
@@ -84,30 +85,26 @@ class DSLCompile extends base_command_1.BaseCommand {
             const outputFile = path_1.default.join(output, path_1.default.format({
                 ...path_1.default.parse(relativePath),
                 base: undefined,
-                ext: ".json",
+                ext,
             }));
             this.log(`${log_symbols_1.default.info} Compiling %s ${figures_1.default.arrowRight} %s as type %s`, (0, fs_2.normalizePath)(file), (0, fs_2.normalizePath)(outputFile), contentType);
             const compileResult = await context.hooks.compileContent.call({ type: contentType }, preProcessedValue, file);
             if (compileResult) {
-                const contentStr = JSON.stringify(compileResult.value, null, 2);
                 await (0, mkdirp_1.default)(path_1.default.dirname(outputFile));
-                await fs_1.promises.writeFile(outputFile, contentStr);
+                await fs_1.promises.writeFile(outputFile, compileResult.value);
                 if (compileResult.sourceMap) {
                     await fs_1.promises.writeFile(`${outputFile}.map`, compileResult.sourceMap);
                 }
-                if (contentType) {
-                    return {
-                        contentType,
-                        outputFile,
-                        inputFile: file,
-                    };
-                }
                 return {
                     contentType,
                     outputFile,
                     inputFile: file,
                 };
             }
+            else {
+                this.log(`${log_symbols_1.default.error} Error compiling %s, no result was returned by compiler`, (0, fs_2.normalizePath)(file));
+                throw new Error(`Error compiling file ${(0, fs_2.normalizePath)(file)}`);
+            }
         };
         const compilerResults = [];
         // This has to be done serially b/c of the way React logs messages to console.error

package/dist/utils/compilation-context.d.ts

@@ -1,5 +1,20 @@
-import type { DSLCompiler, CompilerReturn, SerializeContext } from "@player-tools/dsl";
+import type { DSLCompiler, SerializeContext } from "@player-tools/dsl";
 import { AsyncSeriesBailHook } from "tapable-ts";
+export interface identifyContentReturn {
+    /** The identified type the content should be compiled as */
+    type: string;
+    /** The file extension the content should be written as */
+    extension: string;
+}
+export interface compileContentArgs extends Omit<SerializeContext, "type"> {
+    type: string;
+}
+export interface compilationResult {
+    /** the JSON value of the source */
+    value: string;
+    /** The sourcemap of the content */
+    sourceMap?: string;
+}
 /**
  *
  */
@@ -11,9 +26,9 @@ export declare class CompilationContext {
          *
          * @param fileName - The relative name of the file
          * @param content - The contents in the file
-         * @returns string with the content type.
+         * @returns content type and extension
          */
-        identifyContentType: AsyncSeriesBailHook<[string, any], string, Record<string, any>>;
+        identifyContentType: AsyncSeriesBailHook<[string, any], identifyContentReturn, Record<string, any>>;
         /**
          * Function for returning the compile content given an specific type or condition
          *
@@ -22,7 +37,7 @@ export declare class CompilationContext {
          * @param fileName - The relative name of the file
          * @returns CompilerReturn object instance or undefined
          */
-        compileContent: AsyncSeriesBailHook<[SerializeContext, any, string], CompilerReturn, Record<string, any>>;
+        compileContent: AsyncSeriesBailHook<[compileContentArgs, any, string], compilationResult, Record<string, any>>;
     };
     /** A DSL compiler instance */
     dslCompiler: DSLCompiler;

package/dist/utils/compilation-context.js

@@ -14,7 +14,7 @@ class CompilationContext {
          *
          * @param fileName - The relative name of the file
          * @param content - The contents in the file
-         * @returns string with the content type.
+         * @returns content type and extension
          */
         identifyContentType: new tapable_ts_1.AsyncSeriesBailHook(),
         /**
@@ -33,7 +33,15 @@ class CompilationContext {
         this.dslCompiler = dslCompiler;
         this.hooks.compileContent.tap("default", async ({ type }, content) => {
             if ((0, dsl_1.isDefaultCompilerContentType)(type)) {
-                return this.dslCompiler.serialize(content, { type });
+                const compilationResults = await this.dslCompiler.serialize(content, {
+                    type,
+                });
+                if (compilationResults) {
+                    return {
+                        value: JSON.stringify(compilationResults.value),
+                        sourceMap: compilationResults.sourceMap,
+                    };
+                }
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/cli",
-  "version": "0.7.0-next.6",
+  "version": "0.7.0-next.7",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -21,12 +21,12 @@
     "player": "bin/run"
   },
   "dependencies": {
-    "@player-tools/dsl": "0.7.0-next.6",
-    "@player-tools/json-language-service": "0.7.0-next.6",
-    "@player-tools/xlr": "0.7.0-next.6",
-    "@player-tools/xlr-converters": "0.7.0-next.6",
-    "@player-tools/xlr-sdk": "0.7.0-next.6",
-    "@player-tools/xlr-utils": "0.7.0-next.6",
+    "@player-tools/dsl": "0.7.0-next.7",
+    "@player-tools/json-language-service": "0.7.0-next.7",
+    "@player-tools/xlr": "0.7.0-next.7",
+    "@player-tools/xlr-converters": "0.7.0-next.7",
+    "@player-tools/xlr-sdk": "0.7.0-next.7",
+    "@player-tools/xlr-utils": "0.7.0-next.7",
     "@babel/plugin-transform-react-jsx-source": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",