lucid-package 0.0.97 → 0.0.98

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.97",
+    "version": "0.0.98",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/angularframeworkutils.d.ts

@@ -1 +1 @@
-export declare function createAngularEditorExtension(name: string, isInternalTesting: boolean, skipSDKDependency: boolean): Promise<void>;
+export declare function createAngularEditorExtension(name: string, isInternal: boolean, skipSDKDependency: boolean): Promise<void>;

package/src/angularframeworkutils.js

@@ -7,8 +7,8 @@ const editorextension_1 = require("./editorextension");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
 const theme_1 = require("./theme");
-async function createAngularEditorExtension(name, isInternalTesting, skipSDKDependency) {
-    await (0, editorextension_1.createEditorExtension)(name, isInternalTesting, skipSDKDependency, path.join('angular', 'skeleton'), [
+async function createAngularEditorExtension(name, isInternal, skipSDKDependency) {
+    await (0, editorextension_1.createEditorExtension)(name, isInternal, skipSDKDependency, path.join('angular', 'skeleton'), [
         'webpack-shell-plugin-next',
     ]);
     const angularProjectName = name;
@@ -24,6 +24,6 @@ async function createAngularEditorExtension(name, isInternalTesting, skipSDKDepe
     packageJson.name = angularProjectName;
     await fs.writeFile('package.json', JSON.stringify(packageJson, null, 4));
     console.log('Installing Angular dependencies');
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting, skipSDKDependency);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, skipSDKDependency);
 }
 exports.createAngularEditorExtension = createAngularEditorExtension;

package/src/dataconnector.d.ts

@@ -1 +1 @@
-export declare function createDataConnector(name: string, isInternalTesting: boolean, skipSDKDependency: boolean): Promise<void>;
+export declare function createDataConnector(name: string, isInternal: boolean, skipSDKDependency: boolean): Promise<void>;

package/src/dataconnector.js

@@ -6,7 +6,7 @@ const filesystemutil_1 = require("./filesystemutil");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
 const theme_1 = require("./theme");
-async function createDataConnector(name, isInternalTesting, skipSDKDependency) {
+async function createDataConnector(name, isInternal, skipSDKDependency) {
     console.log((0, theme_1.success)('Creating data connector in dataconnectors/' + name));
     const source = path.join(__dirname, '..', 'templates', 'dataconnector');
     const targetFolder = path.join('dataconnectors', name);
@@ -24,6 +24,6 @@ async function createDataConnector(name, isInternalTesting, skipSDKDependency) {
     });
     console.log(`Installing dependencies`);
     process.chdir(targetFolder);
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting, skipSDKDependency);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, skipSDKDependency);
 }
 exports.createDataConnector = createDataConnector;

package/src/editorextension.d.ts

@@ -1,13 +1,13 @@
 import { Compiler } from 'webpack';
-export declare function createEditorExtension(name: string, isInternalTesting: boolean, skipSDKDependency: boolean, source?: string, deps?: string[]): Promise<void>;
-export declare function buildEditorExtension(name: string, isInternalTesting: boolean, quiet?: boolean): Promise<void>;
+export declare function createEditorExtension(name: string, isInternal: boolean, skipSDKDependency: boolean, source?: string, deps?: string[]): Promise<void>;
+export declare function buildEditorExtension(name: string, isInternal: boolean, quiet?: boolean): Promise<void>;
 export declare function updateExtensionSDK(name: string): Promise<void>;
 /**
  * Uses webpack to watch for changes in the editor extension
  * @param name The editor extension name
  * @param quiet If true, will only show errors in output
  */
-export declare function watchEditorExtension(name: string, isInternalTesting: boolean, quiet?: boolean): Promise<{
+export declare function watchEditorExtension(name: string, isInternal: boolean, quiet?: boolean): Promise<{
     name: string;
     compiler: Compiler;
 }>;
@@ -16,5 +16,5 @@ export declare function watchEditorExtension(name: string, isInternalTesting: bo
  * @param extensionNames The names of the editor extensions
  * @param quiet If true, will only show errors in output
  */
-export declare function debugEditorExtension(extensionNames: string[], isInternalTesting: boolean, quiet?: boolean, pickAnyPort?: boolean): Promise<void>;
+export declare function debugEditorExtension(extensionNames: string[], isInternal: boolean, quiet?: boolean, pickAnyPort?: boolean): Promise<void>;
 export declare function getAllExtensionNames(): Promise<string[]>;

package/src/editorextension.js

@@ -19,7 +19,7 @@ const webpack = require('webpack');
 const WebPackCLI = require('webpack-cli');
 const ws = require('ws');
 const chokidar = require('chokidar');
-async function createEditorExtension(name, isInternalTesting, skipSDKDependency, source = 'vanilla', deps = []) {
+async function createEditorExtension(name, isInternal, skipSDKDependency, source = 'vanilla', deps = []) {
     const editorExtensionSource = path.join(__dirname, '..', 'templates', 'editorextension', source);
     const editorExtensionTargetFolder = path.join('editorextensions', name);
     const publicSource = path.join(__dirname, '..', 'templates', 'public');
@@ -42,13 +42,13 @@ async function createEditorExtension(name, isInternalTesting, skipSDKDependency,
     });
     console.log(`Installing dependencies`);
     process.chdir(editorExtensionTargetFolder);
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting, skipSDKDependency, deps);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, skipSDKDependency, deps);
 }
 exports.createEditorExtension = createEditorExtension;
-async function buildEditorExtension(name, isInternalTesting, quiet = false) {
+async function buildEditorExtension(name, isInternal, quiet = false) {
     const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal);
     const cli = new WebPackCLI();
     await cli.run(['node', 'webpack', '--mode', 'production', ...(quiet ? ['--stats', 'errors-only'] : [])]);
 }
@@ -65,11 +65,11 @@ exports.updateExtensionSDK = updateExtensionSDK;
  * @param name The editor extension name
  * @param quiet If true, will only show errors in output
  */
-async function watchEditorExtension(name, isInternalTesting, quiet = false) {
+async function watchEditorExtension(name, isInternal, quiet = false) {
     const originalDirectory = process.cwd();
     const extensionCodePath = path.join('editorextensions', await getExtensionCodeDirectoryName(name));
     process.chdir(extensionCodePath);
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal);
     const webpackConfigExport = require(path.resolve('webpack.config.js'));
     // For backwards compatibility, we need to support extensions where the webpack config is a fuction or an object
     const webpackConfig = typeof webpackConfigExport == 'function' ? webpackConfigExport({ environment: 'dev' }) : webpackConfigExport;
@@ -90,9 +90,9 @@ exports.watchEditorExtension = watchEditorExtension;
  * @param extensionNames The names of the editor extensions
  * @param quiet If true, will only show errors in output
  */
-async function debugEditorExtension(extensionNames, isInternalTesting, quiet = false, pickAnyPort = false) {
+async function debugEditorExtension(extensionNames, isInternal, quiet = false, pickAnyPort = false) {
     const port = 9900;
-    const watchers = await Promise.all(extensionNames.map(async (name) => watchEditorExtension(name, isInternalTesting, quiet)));
+    const watchers = await Promise.all(extensionNames.map(async (name) => watchEditorExtension(name, isInternal, quiet)));
     startCustomUIServers(extensionNames);
     const app = express();
     const server = listen(app, port, pickAnyPort);

package/src/index.js

@@ -14,9 +14,16 @@ class LucidSuiteExtensionCLI {
         const parser = new argparse_1.ArgumentParser({
             description: 'Create and manage Lucid extension packages',
         });
-        //When running with `bazel run //extensibility/lucid-package:dev`, this gives the root directory to create projects in.
+        // For internal development, creating and operating on a package via bazel
+        parser.add_argument('--is-internal', {
+            default: false,
+            action: 'store_true',
+            help: argparse_1.SUPPRESS,
+        });
+        // Gives the root directory to create projects in.
         parser.add_argument('--chdir', { type: 'str', help: argparse_1.SUPPRESS });
-        //When running with bazel, specifies a project name inside the chdir. Otherwise, directly specifies a directory to chdir to.
+        // If running with the chdir argument, specifies a project name inside the chdir.
+        // Otherwise (if not running with the chdir argument), directly specifies a directory to chdir to.
         parser.add_argument('--project', '-p', {
             type: 'str',
             help: argparse_1.SUPPRESS,
@@ -116,9 +123,13 @@ class LucidSuiteExtensionCLI {
             help: argparse_1.SUPPRESS,
         });
         const parsed = parser.parse_args(args);
-        //For internal development, creating and operating on a "test" package via bazel
-        let isInternalTesting = !!parsed['chdir'];
-        if (isInternalTesting) {
+        //For internal development, creating and operating on a package via bazel
+        const isInternal = parsed['is_internal'] ||
+            // If we've spawned a child process recursively calling a new lucid-package target,
+            // as long as it's originally triggered by Bazel then we're still using Bazel flows.
+            process.env['BAZEL_TARGET'];
+        let isChdir = !!parsed['chdir'];
+        if (isChdir) {
             if (parsed['project']) {
                 process.chdir(path.join(parsed['chdir'], parsed['project']));
             }
@@ -129,11 +140,6 @@ class LucidSuiteExtensionCLI {
         else if (parsed['project']) {
             process.chdir(parsed['project']);
         }
-        //If we've spawned a child process recursively calling a new lucid-package target,
-        //then we're still testing as long as it's originally triggered by Bazel.
-        if (process.env['BAZEL_TARGET']) {
-            isInternalTesting = true;
-        }
         switch (parsed['command']) {
             case 'create':
                 if (parsed['name'] == null) {
@@ -154,17 +160,17 @@ class LucidSuiteExtensionCLI {
                                 const choice = await interactive.selectPrompt('Please select a framework', options);
                                 switch (choice) {
                                     case 0:
-                                        await (0, angularframeworkutils_1.createAngularEditorExtension)(editorExtensionName, isInternalTesting, false);
+                                        await (0, angularframeworkutils_1.createAngularEditorExtension)(editorExtensionName, isInternal, false);
                                         break;
                                     case 1:
                                         const options = ['Javascript', 'Typescript'];
                                         const choice = await interactive.selectPrompt('Please select flavor', options);
-                                        await (0, reactframeworkutils_1.createReactEditorExtension)(editorExtensionName, options[choice], isInternalTesting, false);
+                                        await (0, reactframeworkutils_1.createReactEditorExtension)(editorExtensionName, options[choice], isInternal, false);
                                         break;
                                 }
                             }
                             else {
-                                await (0, editorextension_1.createEditorExtension)(editorExtensionName, isInternalTesting, false);
+                                await (0, editorextension_1.createEditorExtension)(editorExtensionName, isInternal, false);
                             }
                             break;
                         case 1:
@@ -175,7 +181,7 @@ class LucidSuiteExtensionCLI {
                         case 2:
                             process.chdir(packagePath);
                             const dataConnectorName = await interactive.inputPrompt('Please enter the name of the data connector');
-                            await (0, dataconnector_1.createDataConnector)(dataConnectorName, isInternalTesting, false);
+                            await (0, dataconnector_1.createDataConnector)(dataConnectorName, isInternal, false);
                             break;
                     }
                 }
@@ -194,10 +200,10 @@ class LucidSuiteExtensionCLI {
                             await (0, package_1.updateAllExtensionSDK)();
                             break;
                         case 'create-editor-extension':
-                            await (0, editorextension_1.createEditorExtension)(parsed['name'], isInternalTesting, parsed['skip_sdk']);
+                            await (0, editorextension_1.createEditorExtension)(parsed['name'], isInternal, parsed['skip_sdk']);
                             break;
                         case 'build-editor-extension':
-                            await (0, editorextension_1.buildEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet']);
+                            await (0, editorextension_1.buildEditorExtension)(parsed['name'], isInternal, parsed['quiet']);
                             break;
                         case 'create-shape-library':
                             await (0, shapelibrary_1.createEmptyShapeLibrary)(parsed['name']);
@@ -213,7 +219,7 @@ class LucidSuiteExtensionCLI {
                             await (0, shapelibrary_1.createImageShapeLibrary)(parsed['name'], parsed['path'], config);
                             break;
                         case 'create-data-connector':
-                            await (0, dataconnector_1.createDataConnector)(parsed['name'], isInternalTesting, parsed['skip_sdk']);
+                            await (0, dataconnector_1.createDataConnector)(parsed['name'], isInternal, parsed['skip_sdk']);
                             break;
                         case 'test-shape-libraries':
                             await (0, shapelibrary_1.debugShapeLibraries)();
@@ -222,10 +228,10 @@ class LucidSuiteExtensionCLI {
                             if (parsed['name'].length === 0) {
                                 parsed['name'] = await (0, editorextension_1.getAllExtensionNames)();
                             }
-                            await (0, editorextension_1.debugEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet'], parsed['anyport']);
+                            await (0, editorextension_1.debugEditorExtension)(parsed['name'], isInternal, parsed['quiet'], parsed['anyport']);
                             break;
                         case 'watch-editor-extension':
-                            await (0, editorextension_1.watchEditorExtension)(parsed['name'], isInternalTesting, parsed['quiet']);
+                            await (0, editorextension_1.watchEditorExtension)(parsed['name'], isInternal, parsed['quiet']);
                             break;
                         default:
                             parser.print_help();

package/src/installationutil.d.ts

@@ -1,3 +1,3 @@
-export declare function installDependenciesIfNeeded(isInternalTesting: boolean, skipSDKDependency?: boolean, additionalDependencies?: string[]): void;
+export declare function installDependenciesIfNeeded(isInternal: boolean, skipSDKDependency?: boolean, additionalDependencies?: string[]): void;
 export declare function installReactProject(reactProjectName: string, typescript: boolean): void;
 export declare function installAngularProject(angularProjectName: string): void;

package/src/installationutil.js

@@ -5,12 +5,12 @@ const oldFs = require("fs");
 const path = require("path");
 const shellutil_1 = require("./shellutil");
 const theme_1 = require("./theme");
-function installDependenciesIfNeeded(isInternalTesting, skipSDKDependency = false, additionalDependencies = []) {
+function installDependenciesIfNeeded(isInternal, skipSDKDependency = false, additionalDependencies = []) {
     if (!oldFs.existsSync('node_modules')) {
         console.log((0, shellutil_1.execSyncLoggingOutputOnError)('npm install --silent').toString());
     }
     const sdkDir = path.join('node_modules', 'lucid-extension-sdk');
-    if (isInternalTesting) {
+    if (isInternal) {
         //Delete any lucid-extension-sdk directory; let it come from //extensibility/packages/node_modules/lucid-extension-sdk
         oldFs.rmSync(sdkDir, { recursive: true, force: true });
     }

package/src/reactframeworkutils.d.ts

@@ -1 +1 @@
-export declare function createReactEditorExtension(name: string, flavor: string, isInternalTesting: boolean, skipSDKDependency: boolean): Promise<void>;
+export declare function createReactEditorExtension(name: string, flavor: string, isInternal: boolean, skipSDKDependency: boolean): Promise<void>;

package/src/reactframeworkutils.js

@@ -7,8 +7,8 @@ const editorextension_1 = require("./editorextension");
 const installationutil_1 = require("./installationutil");
 const package_1 = require("./package");
 const theme_1 = require("./theme");
-async function createReactEditorExtension(name, flavor, isInternalTesting, skipSDKDependency) {
-    await (0, editorextension_1.createEditorExtension)(name, isInternalTesting, skipSDKDependency, path.join('react', 'skeleton'), [
+async function createReactEditorExtension(name, flavor, isInternal, skipSDKDependency) {
+    await (0, editorextension_1.createEditorExtension)(name, isInternal, skipSDKDependency, path.join('react', 'skeleton'), [
         'webpack-shell-plugin-next',
     ]);
     let typescript = false;
@@ -56,7 +56,7 @@ async function createReactEditorExtension(name, flavor, isInternalTesting, skipS
     const apptsx = (await fs.readFile(path.join('src', appName), 'utf8')).replace('{logo}', '"logo.svg"');
     await fs.writeFile(path.join('src', appName), apptsx);
     console.log('Installing React dependencies');
-    (0, installationutil_1.installDependenciesIfNeeded)(isInternalTesting, skipSDKDependency);
+    (0, installationutil_1.installDependenciesIfNeeded)(isInternal, skipSDKDependency);
 }
 exports.createReactEditorExtension = createReactEditorExtension;
 async function copyFilesTo(sourceFolder, destFolder, endingWith) {