@rindo/core 2.17.1 → 2.17.2-0

package/cli/config-flags.d.ts

@@ -94,9 +94,17 @@ declare type LogLevelFlags = ObjectFromKeys<typeof LOG_LEVEL_CLI_ARGS, LogLevel>
  * on actual flags passed by the user.
  */
 export interface ConfigFlags extends BooleanConfigFlags, StringConfigFlags, NumberConfigFlags, StringNumberConfigFlags, LogLevelFlags {
-    task?: TaskCommand | null;
-    args?: string[];
-    knownArgs?: string[];
-    unknownArgs?: string[];
+    task: TaskCommand | null;
+    args: string[];
+    knownArgs: string[];
+    unknownArgs: string[];
 }
+/**
+ * Helper function for initializing a `ConfigFlags` object. Provide any overrides
+ * for default values and off you go!
+ *
+ * @param init an object with any overrides for default values
+ * @returns a complete CLI flag object
+ */
+export declare const createConfigFlags: (init?: Partial<ConfigFlags>) => ConfigFlags;
 export {};

package/cli/index.cjs

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI (CommonJS) v2.17.1 | MIT Licensed | https://rindojs.web.app
+ Rindo CLI (CommonJS) v2.17.2-0 | MIT Licensed | https://rindojs.web.app
  */
 'use strict';
 
@@ -521,6 +521,23 @@ const CLI_ARG_ALIASES = {
     help: 'h',
     port: 'p',
     version: 'v',
+};
+/**
+ * Helper function for initializing a `ConfigFlags` object. Provide any overrides
+ * for default values and off you go!
+ *
+ * @param init an object with any overrides for default values
+ * @returns a complete CLI flag object
+ */
+const createConfigFlags = (init = {}) => {
+    const flags = {
+        task: null,
+        args: [],
+        knownArgs: [],
+        unknownArgs: [],
+        ...init,
+    };
+    return flags;
 };
 
 /**
@@ -531,12 +548,7 @@ const CLI_ARG_ALIASES = {
  * @returns a structured ConfigFlags object
  */
 const parseFlags = (args, sys) => {
-    const flags = {
-        task: null,
-        args: [],
-        knownArgs: [],
-        unknownArgs: [],
-    };
+    const flags = createConfigFlags();
     // cmd line has more priority over npm scripts cmd
     flags.args = Array.isArray(args) ? args.slice() : [];
     if (flags.args.length > 0 && flags.args[0] && !flags.args[0].startsWith('-')) {
@@ -808,7 +820,7 @@ const getNpmConfigEnvArgs = (sys) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "2.17.1",
+		version: "2.17.2-0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",
@@ -1142,6 +1154,7 @@ const isInteractive = (sys, flags, object) => {
     return terminalInfo.tty && !terminalInfo.ci;
 };
 const UUID_REGEX = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i);
+// Plucked from https://github.com/navify/jigra/blob/HEAD/cli/src/util/uuid.ts
 function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
         const r = (Math.random() * 16) | 0;
@@ -2161,7 +2174,7 @@ const run = async (init) => {
             sys.applyGlobalPatch(sys.getCurrentDirectory());
         }
         if (task === 'help' || flags.help) {
-            await taskHelp({ task: 'help', args }, logger, sys);
+            await taskHelp(createConfigFlags({ task: 'help', args }), logger, sys);
             return;
         }
         startupLog(logger, task);
@@ -2187,7 +2200,7 @@ const run = async (init) => {
         startupLogVersion(logger, task, coreCompiler);
         loadedCompilerLog(sys, logger, flags, coreCompiler);
         if (task === 'info') {
-            await telemetryAction(sys, { flags: { task: 'info' }, logger }, coreCompiler, async () => {
+            await telemetryAction(sys, { flags: createConfigFlags({ task: 'info' }), logger }, coreCompiler, async () => {
                 await taskInfo(coreCompiler, sys, logger);
             });
             return;
@@ -2225,7 +2238,7 @@ const run = async (init) => {
 const runTask = async (coreCompiler, config, task, sys) => {
     var _a, _b;
     const logger = (_a = config.logger) !== null && _a !== void 0 ? _a : createLogger();
-    const strictConfig = { ...config, flags: (_b = { ...config.flags }) !== null && _b !== void 0 ? _b : { task }, logger };
+    const strictConfig = { ...config, flags: createConfigFlags((_b = config.flags) !== null && _b !== void 0 ? _b : { task }), logger };
     strictConfig.outputTargets = strictConfig.outputTargets || [];
     switch (task) {
         case 'build':

package/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI v2.17.1 | MIT Licensed | https://rindojs.web.app
+ Rindo CLI v2.17.2-0 | MIT Licensed | https://rindojs.web.app
  */
 /**
  * This sets the log level hierarchy for our terminal logger, ranging from
@@ -497,6 +497,23 @@ const CLI_ARG_ALIASES = {
     help: 'h',
     port: 'p',
     version: 'v',
+};
+/**
+ * Helper function for initializing a `ConfigFlags` object. Provide any overrides
+ * for default values and off you go!
+ *
+ * @param init an object with any overrides for default values
+ * @returns a complete CLI flag object
+ */
+const createConfigFlags = (init = {}) => {
+    const flags = {
+        task: null,
+        args: [],
+        knownArgs: [],
+        unknownArgs: [],
+        ...init,
+    };
+    return flags;
 };
 
 /**
@@ -507,12 +524,7 @@ const CLI_ARG_ALIASES = {
  * @returns a structured ConfigFlags object
  */
 const parseFlags = (args, sys) => {
-    const flags = {
-        task: null,
-        args: [],
-        knownArgs: [],
-        unknownArgs: [],
-    };
+    const flags = createConfigFlags();
     // cmd line has more priority over npm scripts cmd
     flags.args = Array.isArray(args) ? args.slice() : [];
     if (flags.args.length > 0 && flags.args[0] && !flags.args[0].startsWith('-')) {
@@ -784,7 +796,7 @@ const getNpmConfigEnvArgs = (sys) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "2.17.1",
+		version: "2.17.2-0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",
@@ -1118,6 +1130,7 @@ const isInteractive = (sys, flags, object) => {
     return terminalInfo.tty && !terminalInfo.ci;
 };
 const UUID_REGEX = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i);
+// Plucked from https://github.com/navify/jigra/blob/HEAD/cli/src/util/uuid.ts
 function uuidv4() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
         const r = (Math.random() * 16) | 0;
@@ -2137,7 +2150,7 @@ const run = async (init) => {
             sys.applyGlobalPatch(sys.getCurrentDirectory());
         }
         if (task === 'help' || flags.help) {
-            await taskHelp({ task: 'help', args }, logger, sys);
+            await taskHelp(createConfigFlags({ task: 'help', args }), logger, sys);
             return;
         }
         startupLog(logger, task);
@@ -2163,7 +2176,7 @@ const run = async (init) => {
         startupLogVersion(logger, task, coreCompiler);
         loadedCompilerLog(sys, logger, flags, coreCompiler);
         if (task === 'info') {
-            await telemetryAction(sys, { flags: { task: 'info' }, logger }, coreCompiler, async () => {
+            await telemetryAction(sys, { flags: createConfigFlags({ task: 'info' }), logger }, coreCompiler, async () => {
                 await taskInfo(coreCompiler, sys, logger);
             });
             return;
@@ -2201,7 +2214,7 @@ const run = async (init) => {
 const runTask = async (coreCompiler, config, task, sys) => {
     var _a, _b;
     const logger = (_a = config.logger) !== null && _a !== void 0 ? _a : createLogger();
-    const strictConfig = { ...config, flags: (_b = { ...config.flags }) !== null && _b !== void 0 ? _b : { task }, logger };
+    const strictConfig = { ...config, flags: createConfigFlags((_b = config.flags) !== null && _b !== void 0 ? _b : { task }), logger };
     strictConfig.outputTargets = strictConfig.outputTargets || [];
     switch (task) {
         case 'build':

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/cli",
-  "version": "2.17.1",
+  "version": "2.17.2-0",
   "description": "Rindo CLI.",
   "main": "./index.cjs",
   "module": "./index.js",

package/compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/compiler",
-  "version": "2.17.1",
+  "version": "2.17.2-0",
   "description": "Rindo Compiler.",
   "main": "./rindo.js",
   "types": "./rindo.d.ts",

package/compiler/rindo.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Compiler v2.17.1 | MIT Licensed | https://rindojs.web.app
+ Rindo Compiler v2.17.2-0 | MIT Licensed | https://rindojs.web.app
  */
 (function(exports) {
 'use strict';
@@ -4575,7 +4575,7 @@ const createCustomResolverAsync = (sys, inMemoryFs, exts) => {
   };
 };
 
-const buildId = '20230111074933';
+const buildId = '20230111105534';
 const minfyJsId = 'terser5.6.1_7';
 const optimizeCssId = 'autoprefixer10.2.5_postcss8.4.16_7';
 const parse5Version = '6.0.1';
@@ -4583,8 +4583,8 @@ const rollupVersion = '2.42.3';
 const sizzleVersion = '2.42.3';
 const terserVersion = '5.6.1';
 const typescriptVersion = '4.5.4';
-const vermoji = '🍏';
-const version$3 = '2.17.1';
+const vermoji = '📬';
+const version$3 = '2.17.2-0';
 const versions = {
   rindo: version$3,
   parse5: parse5Version,
@@ -15460,6 +15460,25 @@ class MockMouseEvent extends MockEvent {
     }
   }
 }
+class MockUIEvent extends MockEvent {
+  constructor(type, uiEventInitDic) {
+    super(type);
+    this.detail = null;
+    this.view = null;
+    if (uiEventInitDic != null) {
+      Object.assign(this, uiEventInitDic);
+    }
+  }
+}
+class MockFocusEvent extends MockUIEvent {
+  constructor(type, focusEventInitDic) {
+    super(type);
+    this.relatedTarget = null;
+    if (focusEventInitDic != null) {
+      Object.assign(this, focusEventInitDic);
+    }
+  }
+}
 class MockEventListener {
   constructor(type, handler) {
     this.type = type;
@@ -16374,7 +16393,7 @@ class MockElement extends MockNode {
     return shadowRoot;
   }
   blur() {
-    /**/
+    dispatchEvent(this, new MockFocusEvent('blur', { relatedTarget: null, bubbles: true, cancelable: true, composed: true }));
   }
   get shadowRoot() {
     return this.__shadowRoot || null;
@@ -16444,7 +16463,9 @@ class MockElement extends MockNode {
   get firstElementChild() {
     return this.children[0] || null;
   }
-  focus(_options) { }
+  focus(_options) {
+    dispatchEvent(this, new MockFocusEvent('focus', { relatedTarget: null, bubbles: true, cancelable: true, composed: true }));
+  }
   getAttribute(attrName) {
     if (attrName === 'style') {
       if (this.__style != null && this.__style.length > 0) {
@@ -18094,6 +18115,7 @@ const GLOBAL_CONSTRUCTORS = [
   ['CustomEvent', MockCustomEvent],
   ['Event', MockEvent],
   ['Headers', MockHeaders],
+  ['FocusEvent', MockFocusEvent],
   ['KeyboardEvent', MockKeyboardEvent],
   ['MouseEvent', MockMouseEvent],
   ['Request', MockRequest],
@@ -56655,7 +56677,7 @@ const addCustomElementInputs = (buildCtx, bundleOpts) => {
       exp.push(`import { ${importName} as ${importAs}, defineCustomElement as cmpDefCustomEle } from '${cmp.sourceFilePath}';`);
       exp.push(`export const ${exportName} = ${importAs};`);
       exp.push(`export const defineCustomElement = cmpDefCustomEle;`);
-      // Here we push an export (with a rename for `defineCustomElement` for
+      // Here we push an export (with a rename for `defineCustomElement`) for
       // this component onto our array which references the `coreKey` (prefixed
       // with `\0`). We have to do this so that our import is referencing the
       // correct virtual module, if we instead referenced, for instance,
@@ -60707,7 +60729,7 @@ const generateCustomElementsTypesOutput = async (config, compilerCtx, buildCtx,
   // the path where we're going to write the typedef for the whole dist-custom-elements output
   const customElementsDtsPath = join(outputTarget.dir, 'index.d.ts');
   // the directory where types for the individual components are written
-  const componentsTypeDirectoryPath = relative$1(outputTarget.dir, join(typesDir, 'components'));
+  const componentsTypeDirectoryRelPath = relative$1(outputTarget.dir, typesDir);
   const components = buildCtx.components.filter((m) => !m.isCollectionDependency);
   const code = [
     `/* ${config.namespace} custom elements */`,
@@ -60716,7 +60738,14 @@ const generateCustomElementsTypesOutput = async (config, compilerCtx, buildCtx,
       const importName = component.componentClassName;
       // typedefs for individual components can be found under paths like
       // $TYPES_DIR/components/my-component/my-component.d.ts
-      const componentDTSPath = join(componentsTypeDirectoryPath, component.tagName, component.tagName);
+      //
+      // To construct this path we:
+      //
+      // - get the relative path to the component's source file from the source directory
+      // - join that relative path to the relative path from the `index.d.ts` file to the
+      //   directory where typedefs are saved
+      const componentSourceRelPath = relative$1(config.srcDir, component.sourceFilePath).replace('.tsx', '');
+      const componentDTSPath = join(componentsTypeDirectoryRelPath, componentSourceRelPath);
       return `export { ${importName} as ${exportName} } from '${componentDTSPath}';`;
     }),
     ``,
@@ -64917,11 +64946,31 @@ const updateCompilerCtxCache = (config, compilerCtx, path, kind) => {
   }
 };
 
+/**
+ * All the Boolean options supported by the Rindo CLI
+ */
+/**
+ * Helper function for initializing a `ConfigFlags` object. Provide any overrides
+ * for default values and off you go!
+ *
+ * @param init an object with any overrides for default values
+ * @returns a complete CLI flag object
+ */
+const createConfigFlags = (init = {}) => {
+  const flags = {
+    task: null,
+    args: [],
+    knownArgs: [],
+    unknownArgs: [],
+    ...init,
+  };
+  return flags;
+};
+
 const getConfig = (userConfig) => {
   var _a, _b;
-  const flags = (_a = userConfig.flags) !== null && _a !== void 0 ? _a : {};
-  const logger = (_b = userConfig.logger) !== null && _b !== void 0 ? _b : createLogger();
-  const config = { ...userConfig, flags, logger };
+  const logger = (_a = userConfig.logger) !== null && _a !== void 0 ? _a : createLogger();
+  const config = { ...userConfig, flags: createConfigFlags((_b = userConfig.flags) !== null && _b !== void 0 ? _b : {}), logger };
   if (!config.sys) {
     config.sys = createSystem({ logger: config.logger });
   }
@@ -65630,7 +65679,7 @@ const getComponentPathContent = (componentGraph, outputTarget) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "2.17.1",
+		version: "2.17.2-0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",