@rindo/core 3.0.0-rc.0 → 3.0.0

package/cli/index.cjs

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI (CommonJS) v3.0.0-rc.0 | MIT Licensed | https://rindojs.web.app
+ Rindo CLI (CommonJS) v3.0.0 | MIT Licensed | https://rindojs.web.app
  */
 'use strict';
 
@@ -987,7 +987,7 @@ const dereferenceAlias = (maybeAlias) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "3.0.0-rc.0",
+		version: "3.0.0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",
@@ -2552,16 +2552,20 @@ const run = async (init) => {
  * @public
  */
 const runTask = async (coreCompiler, config, task, sys) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const logger = (_a = config.logger) !== null && _a !== void 0 ? _a : createLogger();
+    const rootDir = (_b = config.rootDir) !== null && _b !== void 0 ? _b : '/';
+    const configSys = (_c = sys !== null && sys !== void 0 ? sys : config.sys) !== null && _c !== void 0 ? _c : coreCompiler.createSystem({ logger });
     const strictConfig = {
         ...config,
-        flags: createConfigFlags((_b = config.flags) !== null && _b !== void 0 ? _b : { task }),
+        flags: createConfigFlags((_d = config.flags) !== null && _d !== void 0 ? _d : { task }),
+        hydratedFlag: (_e = config.hydratedFlag) !== null && _e !== void 0 ? _e : null,
         logger,
-        outputTargets: (_c = config.outputTargets) !== null && _c !== void 0 ? _c : [],
-        rootDir: (_d = config.rootDir) !== null && _d !== void 0 ? _d : '/',
-        sys: (_e = sys !== null && sys !== void 0 ? sys : config.sys) !== null && _e !== void 0 ? _e : coreCompiler.createSystem({ logger }),
-        testing: (_f = config.testing) !== null && _f !== void 0 ? _f : {},
+        outputTargets: (_f = config.outputTargets) !== null && _f !== void 0 ? _f : [],
+        packageJsonFilePath: configSys.platformPath.join(rootDir, 'package.json'),
+        rootDir,
+        sys: configSys,
+        testing: (_g = config.testing) !== null && _g !== void 0 ? _g : {},
     };
     switch (task) {
         case 'build':

package/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI v3.0.0-rc.0 | MIT Licensed | https://rindojs.web.app
+ Rindo CLI v3.0.0 | MIT Licensed | https://rindojs.web.app
  */
 /**
  * Convert a string from dash-case / kebab-case to PascalCase (or CamelCase,
@@ -963,7 +963,7 @@ const dereferenceAlias = (maybeAlias) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "3.0.0-rc.0",
+		version: "3.0.0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",
@@ -2528,16 +2528,20 @@ const run = async (init) => {
  * @public
  */
 const runTask = async (coreCompiler, config, task, sys) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const logger = (_a = config.logger) !== null && _a !== void 0 ? _a : createLogger();
+    const rootDir = (_b = config.rootDir) !== null && _b !== void 0 ? _b : '/';
+    const configSys = (_c = sys !== null && sys !== void 0 ? sys : config.sys) !== null && _c !== void 0 ? _c : coreCompiler.createSystem({ logger });
     const strictConfig = {
         ...config,
-        flags: createConfigFlags((_b = config.flags) !== null && _b !== void 0 ? _b : { task }),
+        flags: createConfigFlags((_d = config.flags) !== null && _d !== void 0 ? _d : { task }),
+        hydratedFlag: (_e = config.hydratedFlag) !== null && _e !== void 0 ? _e : null,
         logger,
-        outputTargets: (_c = config.outputTargets) !== null && _c !== void 0 ? _c : [],
-        rootDir: (_d = config.rootDir) !== null && _d !== void 0 ? _d : '/',
-        sys: (_e = sys !== null && sys !== void 0 ? sys : config.sys) !== null && _e !== void 0 ? _e : coreCompiler.createSystem({ logger }),
-        testing: (_f = config.testing) !== null && _f !== void 0 ? _f : {},
+        outputTargets: (_f = config.outputTargets) !== null && _f !== void 0 ? _f : [],
+        packageJsonFilePath: configSys.platformPath.join(rootDir, 'package.json'),
+        rootDir,
+        sys: configSys,
+        testing: (_g = config.testing) !== null && _g !== void 0 ? _g : {},
     };
     switch (task) {
         case 'build':

package/cli/package.json

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

package/compiler/package.json

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

package/compiler/rindo.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Compiler v3.0.0-rc.0 | MIT Licensed | https://rindojs.web.app
+ Rindo Compiler v3.0.0 | MIT Licensed | https://rindojs.web.app
  */
 (function(exports) {
 'use strict';
@@ -1047,21 +1047,24 @@ const loadTypeScriptDiagnostics = (tsDiagnostics) => {
  * @returns a Rindo diagnostic, suitable for showing an error to the user
  */
 const loadTypeScriptDiagnostic = (tsDiagnostic) => {
+  var _a;
   const d = {
-    level: 'warn',
-    type: 'typescript',
-    language: 'typescript',
-    header: 'TypeScript',
+    absFilePath: undefined,
     code: tsDiagnostic.code.toString(),
-    messageText: flattenDiagnosticMessageText(tsDiagnostic, tsDiagnostic.messageText),
-    relFilePath: null,
-    absFilePath: null,
+    columnNumber: undefined,
+    header: 'TypeScript',
+    language: 'typescript',
+    level: 'warn',
+    lineNumber: undefined,
     lines: [],
+    messageText: flattenDiagnosticMessageText(tsDiagnostic, tsDiagnostic.messageText),
+    relFilePath: undefined,
+    type: 'typescript',
   };
   if (tsDiagnostic.category === 1) {
     d.level = 'error';
   }
-  if (tsDiagnostic.file) {
+  if (tsDiagnostic.file && typeof tsDiagnostic.start === 'number') {
     d.absFilePath = tsDiagnostic.file.fileName;
     const sourceText = tsDiagnostic.file.text;
     const srcLines = splitLineBreaks(sourceText);
@@ -1071,7 +1074,7 @@ const loadTypeScriptDiagnostic = (tsDiagnostic) => {
       lineNumber: posData.line + 1,
       text: srcLines[posData.line],
       errorCharStart: posData.character,
-      errorLength: Math.max(tsDiagnostic.length, 1),
+      errorLength: Math.max((_a = tsDiagnostic.length) !== null && _a !== void 0 ? _a : 0, 1),
     };
     d.lineNumber = errorLine.lineNumber;
     d.columnNumber = errorLine.errorCharStart + 1;
@@ -2098,7 +2101,7 @@ const process$3 = /*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), p
   'default': process_1
 });
 
-const buildId = '20230405135121';
+const buildId = '20230405141918';
 const minfyJsId = 'terser5.16.1_7';
 const optimizeCssId = 'autoprefixer10.4.13_postcss8.4.21_7';
 const parse5Version = '7.1.2';
@@ -2106,8 +2109,8 @@ const rollupVersion = '2.42.3';
 const sizzleVersion = '2.42.3';
 const terserVersion = '5.16.1';
 const typescriptVersion = '4.9.4';
-const vermoji = '🦄';
-const version$3 = '3.0.0-rc.0';
+const vermoji = '📣';
+const version$3 = '3.0.0';
 const versions = {
   rindo: version$3,
   parse5: parse5Version,
@@ -4839,6 +4842,7 @@ const autoprefixCss = async (cssText, opts) => {
         messageText: warning.text,
         level: 'warn',
         type: 'css',
+        lines: [],
       });
     });
     output.output = result.css;
@@ -4849,6 +4853,7 @@ const autoprefixCss = async (cssText, opts) => {
       messageText: `CSS Error` + e,
       level: `error`,
       type: `css`,
+      lines: [],
     };
     if (typeof e.name === 'string') {
       diagnostic.header = e.name;
@@ -57216,6 +57221,7 @@ const bundleCustomElements$1 = async (config, compilerCtx, buildCtx, outputTarge
           level: 'error',
           type: 'build',
           messageText: 'dist-custom-elements output target provided with no output target directory!',
+          lines: [],
         });
         return;
       }
@@ -65099,8 +65105,9 @@ function generateBuildStats(config, buildCtx) {
   }
   catch (e) {
     const diagnostic = {
-      messageText: `Generate Build Stats Error: ` + e,
       level: `error`,
+      lines: [],
+      messageText: `Generate Build Stats Error: ` + e,
       type: `build`,
     };
     jsonData = {
@@ -66483,15 +66490,18 @@ const createConfigFlags = (init = {}) => {
 };
 
 const getConfig = (userConfig) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const logger = (_a = userConfig.logger) !== null && _a !== void 0 ? _a : createLogger();
+  const rootDir = (_b = userConfig.rootDir) !== null && _b !== void 0 ? _b : '/';
   const config = {
     ...userConfig,
-    flags: createConfigFlags((_b = userConfig.flags) !== null && _b !== void 0 ? _b : {}),
+    flags: createConfigFlags((_c = userConfig.flags) !== null && _c !== void 0 ? _c : {}),
+    hydratedFlag: (_d = userConfig.hydratedFlag) !== null && _d !== void 0 ? _d : null,
     logger,
-    outputTargets: (_c = userConfig.outputTargets) !== null && _c !== void 0 ? _c : [],
-    rootDir: (_d = userConfig.rootDir) !== null && _d !== void 0 ? _d : '/',
-    sys: (_e = userConfig.sys) !== null && _e !== void 0 ? _e : createSystem({ logger }),
+    outputTargets: (_e = userConfig.outputTargets) !== null && _e !== void 0 ? _e : [],
+    packageJsonFilePath: join(rootDir, 'package.json'),
+    rootDir,
+    sys: (_f = userConfig.sys) !== null && _f !== void 0 ? _f : createSystem({ logger }),
     testing: userConfig !== null && userConfig !== void 0 ? userConfig : {},
   };
   setPlatformPath(config.sys.platformPath);
@@ -68660,26 +68670,28 @@ const validateDevServer = (config, diagnostics) => {
 };
 
 /**
- * Check the provided `.hydratedFlag` prop and return a properly-validated value.
+ * Validate the `.hydratedFlag` property on the supplied config object and
+ * return a properly-validated value.
  *
  * @param config the configuration we're examining
  * @returns a suitable value for the hydratedFlag property
  */
 const validateHydrated = (config) => {
+  var _a;
   /**
    * If `config.hydratedFlag` is set to `null` that is an explicit signal that we
    * should _not_ create a default configuration when validating and should instead
-   * just return `undefined`. It may also have been set to `false`; this is an invalid
+   * just return `null`. It may also have been set to `false`; this is an invalid
    * value as far as the type system is concerned, but users may ignore this.
    *
    * See {@link HydratedFlag} for more details.
    */
   if (config.hydratedFlag === null || config.hydratedFlag === false) {
-    return undefined;
+    return null;
   }
   // Here we start building up a default config since `.hydratedFlag` wasn't set to
   // `null` on the provided config.
-  const hydratedFlag = { ...config.hydratedFlag };
+  const hydratedFlag = { ...((_a = config.hydratedFlag) !== null && _a !== void 0 ? _a : {}) };
   if (!isString$1(hydratedFlag.name) || hydratedFlag.property === '') {
     hydratedFlag.name = `hydrated`;
   }
@@ -69052,13 +69064,16 @@ const validateConfig = (userConfig = {}, bootstrapConfig) => {
   const config = Object.assign({}, userConfig); // not positive it's json safe
   const diagnostics = [];
   const logger = bootstrapConfig.logger || config.logger || createLogger();
+  const rootDir = typeof config.rootDir === 'string' ? config.rootDir : '/';
   const validatedConfig = {
     ...config,
     // flags _should_ be JSON safe
     flags: JSON.parse(JSON.stringify(config.flags || {})),
+    hydratedFlag: validateHydrated(config),
     logger,
     outputTargets: (_a = config.outputTargets) !== null && _a !== void 0 ? _a : [],
-    rootDir: typeof config.rootDir === 'string' ? config.rootDir : '/',
+    packageJsonFilePath: join(rootDir, 'package.json'),
+    rootDir,
     sys: (_c = (_b = config.sys) !== null && _b !== void 0 ? _b : bootstrapConfig.sys) !== null && _c !== void 0 ? _c : createSystem({ logger }),
     testing: (_d = config.testing) !== null && _d !== void 0 ? _d : {},
   };
@@ -69137,8 +69152,6 @@ const validateConfig = (userConfig = {}, bootstrapConfig) => {
   validatedConfig.devServer = validateDevServer(validatedConfig, diagnostics);
   // testing
   validateTesting(validatedConfig, diagnostics);
-  // hydrate flag
-  validatedConfig.hydratedFlag = validateHydrated(validatedConfig);
   // bundles
   if (Array.isArray(validatedConfig.bundles)) {
     validatedConfig.bundles = sortBy(validatedConfig.bundles, (a) => a.components.length);
@@ -69995,7 +70008,7 @@ const getComponentPathContent = (componentGraph, outputTarget) => {
 const dependencies = [
 	{
 		name: "@rindo/core",
-		version: "3.0.0-rc.0",
+		version: "3.0.0",
 		main: "compiler/rindo.js",
 		resources: [
 			"package.json",