@player-tools/cli 0.4.0-next.1 → 0.4.0-next.3

package/dist/commands/dsl/compile.js

@@ -59,9 +59,9 @@ class DSLCompile extends base_command_1.BaseCommand {
             const results = {
                 exitCode: 0,
             };
+            const compiler = yield this.createDSLCompiler();
             /** Compile a file from the DSL format into JSON */
             const compileFile = (file) => __awaiter(this, void 0, void 0, function* () {
-                const compiler = yield this.createDSLCompiler();
                 const requiredModule = require(path_1.default.resolve(file));
                 const defaultExport = requiredModule.default;
                 if (!defaultExport) {
@@ -106,6 +106,7 @@ class DSLCompile extends base_command_1.BaseCommand {
                     });
                 }
             }
+            yield compiler.hooks.onEnd.call({ output });
             if (!skipValidation) {
                 console.log('');
                 const hasOutput = compilerResults.some((r) => { var _a; return ((_a = r.output) === null || _a === void 0 ? void 0 : _a.contentType) === 'flow'; });

package/dist/commands/xlr/compile.js

@@ -72,7 +72,7 @@ class XLRCompile extends base_command_1.BaseCommand {
     }
     /** Generate extension manifest/description files from an Enhanced Player Plugin */
     processTypes(fileNames, outputDirectory, options, mode = consts_1.Mode.PLUGIN) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         // Build a program using the set of root file names in fileNames
         const program = typescript_1.default.createProgram(fileNames, options);
         fs_1.default.mkdirSync(outputDirectory, { recursive: true });
@@ -105,6 +105,10 @@ class XLRCompile extends base_command_1.BaseCommand {
                     throw new Error(`Error: Option ${mode} not recognized. Valid options are: plugin or type`);
                 }
                 if (generatedCapabilites) {
+                    generatedCapabilites = Object.assign({}, generatedCapabilites);
+                    if (consts_1.customPrimitives) {
+                        generatedCapabilites = Object.assign(Object.assign({}, generatedCapabilites), { customPrimitives: consts_1.customPrimitives });
+                    }
                     capabilities = generatedCapabilites;
                 }
             }
@@ -122,16 +126,19 @@ class XLRCompile extends base_command_1.BaseCommand {
         })
             .join('\n')}
 
-module.exports = {
-  "pluginName": "${capabilities.pluginName}",
-  "capabilities": {
-    ${[...((_d = (_c = capabilities.capabilities) === null || _c === void 0 ? void 0 : _c.entries()) !== null && _d !== void 0 ? _d : [])]
+    module.exports = {
+      "pluginName": "${capabilities.pluginName}",
+      "capabilities": {
+        ${[...((_d = (_c = capabilities.capabilities) === null || _c === void 0 ? void 0 : _c.entries()) !== null && _d !== void 0 ? _d : [])]
             .map(([capabilityName, provides]) => {
             return `"${capabilityName}":[${provides.join(',')}],`;
         })
             .join('\n\t\t')}
-  }
-}
+      },
+      "customPrimitives": [
+        ${[(_f = (_e = capabilities.customPrimitives) === null || _e === void 0 ? void 0 : _e.map((i) => `'${i}'`).join(',')) !== null && _f !== void 0 ? _f : '']}
+      ]
+    }
 `;
         fs_1.default.writeFileSync(path_1.default.join(outputDirectory, 'manifest.js'), tsManifestFile);
     }

package/dist/config.d.ts

@@ -33,5 +33,7 @@ export interface PlayerConfigResolvedShape {
     };
     /** Flattened list of plugins */
     plugins: Array<PlayerCLIPlugin>;
+    /** Catch for any other things that may be in the config for plugged in functionality */
+    [key: string]: any;
 }
 //# sourceMappingURL=config.d.ts.map

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { run } from '@oclif/core';
 export * from './config';
 export * from './plugins';
+export * from './utils/base-command';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -19,3 +19,4 @@ var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });
 __exportStar(require("./config"), exports);
 __exportStar(require("./plugins"), exports);
+__exportStar(require("./utils/base-command"), exports);

package/dist/utils/babel-register.js

@@ -10,9 +10,9 @@ const registerForPaths = () => {
     (0, register_1.default)({
         extensions: ['.es6', '.es', '.jsx', '.js', '.mjs', '.tsx', '.ts'],
         presets: [
-            ['@babel/preset-env', { modules: 'cjs' }],
-            '@babel/preset-typescript',
-            '@babel/preset-react',
+            [require.resolve('@babel/preset-env'), { modules: 'cjs' }],
+            require.resolve('@babel/preset-typescript'),
+            require.resolve('@babel/preset-react'),
         ],
         plugins: ['@babel/plugin-transform-react-jsx-source'],
     });

package/dist/utils/base-command.js

@@ -126,7 +126,11 @@ class BaseCommand extends core_1.Command {
     createDSLCompiler() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const compiler = new dsl_1.DSLCompiler();
+            const compiler = new dsl_1.DSLCompiler({
+                error: this.error.bind(this),
+                warn: this.warn.bind(this),
+                log: this.log.bind(this),
+            });
             const { plugins } = yield this.getPlayerConfig();
             for (let i = 0; i < plugins.length; i++) {
                 // eslint-disable-next-line no-await-in-loop

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.4.0-next.1","commands":{"dsl:compile":{"id":"dsl:compile","description":"Compile Player DSL files into JSON","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to compile.\nAny jsx/ts/tsx files will be loaded via babel-require automatically.","multiple":false},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false},"skip-validation":{"name":"skip-validation","type":"boolean","description":"Option to skip validating the generated JSON","allowNo":false},"exp":{"name":"exp","type":"boolean","description":"Use experimental language features","allowNo":false}},"args":[],"_globalFlags":{}},"json:validate":{"id":"json:validate","description":"Validate Player JSON content","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"files":{"name":"files","type":"option","char":"f","description":"A list of files or globs to validate","multiple":true},"exp":{"name":"exp","type":"boolean","description":"Use experimental language features","allowNo":false}},"args":[],"_globalFlags":{}},"xlr:compile":{"id":"xlr:compile","description":"Compiles typescript files to XLRs format","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to search for types to export","multiple":false,"default":"./src"},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false,"default":"./dist"},"mode":{"name":"mode","type":"option","char":"m","description":"Search strategy for types to export: plugin (default, looks for exported EnchancedPlayerPlugin classes) or type (all exported types)","helpValue":"(plugin|types)","multiple":false,"options":["plugin","types"],"default":"plugin"}},"args":[],"_globalFlags":{}},"xlr:convert":{"id":"xlr:convert","description":"Exports XLRs files to a specific language","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to search for types to export","multiple":false,"default":"./dist"},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false},"lang":{"name":"lang","type":"option","char":"l","description":"Search strategy for types to export: plugin (default, looks for exported EnchancedPlayerPlugin classes) or type (all exported types)","helpValue":"(TypeScript)","multiple":false,"options":["TypeScript"]}},"args":[],"_globalFlags":{}}}}
+{"version":"0.4.0-next.3","commands":{"dsl:compile":{"id":"dsl:compile","description":"Compile Player DSL files into JSON","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to compile.\nAny jsx/ts/tsx files will be loaded via babel-require automatically.","multiple":false},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false},"skip-validation":{"name":"skip-validation","type":"boolean","description":"Option to skip validating the generated JSON","allowNo":false},"exp":{"name":"exp","type":"boolean","description":"Use experimental language features","allowNo":false}},"args":[],"_globalFlags":{}},"json:validate":{"id":"json:validate","description":"Validate Player JSON content","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"files":{"name":"files","type":"option","char":"f","description":"A list of files or globs to validate","multiple":true},"exp":{"name":"exp","type":"boolean","description":"Use experimental language features","allowNo":false}},"args":[],"_globalFlags":{}},"xlr:compile":{"id":"xlr:compile","description":"Compiles typescript files to XLRs format","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to search for types to export","multiple":false,"default":"./src"},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false,"default":"./dist"},"mode":{"name":"mode","type":"option","char":"m","description":"Search strategy for types to export: plugin (default, looks for exported EnchancedPlayerPlugin classes) or type (all exported types)","helpValue":"(plugin|types)","multiple":false,"options":["plugin","types"],"default":"plugin"}},"args":[],"_globalFlags":{}},"xlr:convert":{"id":"xlr:convert","description":"Exports XLRs files to a specific language","strict":false,"pluginName":"@player-tools/cli","pluginAlias":"@player-tools/cli","pluginType":"core","aliases":[],"flags":{"config":{"name":"config","type":"option","char":"c","description":"Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load","multiple":false},"input":{"name":"input","type":"option","char":"i","description":"An input directory to search for types to export","multiple":false,"default":"./dist"},"output":{"name":"output","type":"option","char":"o","description":"Output directory to write results to.","multiple":false},"lang":{"name":"lang","type":"option","char":"l","description":"Search strategy for types to export: plugin (default, looks for exported EnchancedPlayerPlugin classes) or type (all exported types)","helpValue":"(TypeScript)","multiple":false,"options":["TypeScript"]}},"args":[],"_globalFlags":{}}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/cli",
-  "version": "0.4.0-next.1",
+  "version": "0.4.0-next.3",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -28,11 +28,11 @@
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-languageserver-types": "^3.15.1",
     "typescript": "4.8.4",
-    "@player-tools/dsl": "0.4.0-next.1",
-    "@player-tools/json-language-service": "0.4.0-next.1",
-    "@player-tools/xlr-sdk": "0.4.0-next.1",
-    "@player-tools/xlr-utils": "0.4.0-next.1",
-    "@player-tools/xlr-converters": "0.4.0-next.1"
+    "@player-tools/dsl": "0.4.0-next.3",
+    "@player-tools/json-language-service": "0.4.0-next.3",
+    "@player-tools/xlr-sdk": "0.4.0-next.3",
+    "@player-tools/xlr-utils": "0.4.0-next.3",
+    "@player-tools/xlr-converters": "0.4.0-next.3"
   },
   "main": "./dist/index.js",
   "module": "dist/index.esm.js",
@@ -50,5 +50,8 @@
   },
   "bin": {
     "player": "bin/run"
-  }
+  },
+  "plugins": [
+    "@oclif/plugin-plugins"
+  ]
 }