@rindo/core 4.23.0 → 4.23.2

package/compiler/rindo.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Compiler v4.23.0 | MIT Licensed | https://rindojs.web.app
+ Rindo Compiler v4.23.2 | MIT Licensed | https://rindojs.web.app
  */
 "use strict";
 var __create = Object.create;
@@ -2338,7 +2338,7 @@ var require_typescript_5_5_4_bundle_cache_min = __commonJS({
     See the Apache Version 2.0 License for specific language governing permissions
     and limitations under the License.
     ***************************************************************************** */
-    var ts70 = {};
+    var ts71 = {};
     ((module3) => {
       "use strict";
       var _a;
@@ -207859,9 +207859,9 @@ ${e.message}`;
         };
       }
     })({ get exports() {
-      return ts70;
+      return ts71;
     }, set exports(v) {
-      ts70 = v;
+      ts71 = v;
       if (typeof module2 !== "undefined" && module2.exports) {
         module2.exports = v;
       }
@@ -238144,17 +238144,17 @@ __export(compiler_exports, {
   optimizeJs: () => optimizeJs,
   transpile: () => transpile,
   transpileSync: () => transpileSync,
-  ts: () => import_typescript69.default,
+  ts: () => import_typescript70.default,
   validateConfig: () => validateConfig,
   vermoji: () => vermoji,
   version: () => version,
   versions: () => versions
 });
 module.exports = __toCommonJS(compiler_exports);
-var import_typescript69 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript70 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/version.ts
-var buildId = "1756998234";
+var buildId = "1757063755";
 var minfyJsId = "terser5.31.1_7";
 var optimizeCssId = "autoprefixer10.4.19_postcss8.4.38_7";
 var parse5Version = "7.1.2";
@@ -238162,8 +238162,8 @@ var rollupVersion = "2.56.3";
 var jqueryVersion = "4.0.0-pre";
 var terserVersion = "5.31.1";
 var typescriptVersion = "5.5.4";
-var vermoji = "\u{1F9C0}";
-var version = "4.23.0";
+var vermoji = "\u{1F579}";
+var version = "4.23.2";
 var versions = {
   rindo: version,
   parse5: parse5Version,
@@ -239407,7 +239407,7 @@ var validateComponentTag = (tag) => {
 };
 
 // src/compiler/compiler.ts
-var import_typescript65 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript66 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/compiler/build/compiler-ctx.ts
 var import_path4 = require("path");
@@ -241444,7 +241444,10 @@ var createStaticGetter = (propName, returnExpression) => {
 };
 var getStaticValue = (staticMembers, staticName) => {
   const staticMember = staticMembers.find(
-    (member2) => member2.name.escapedText === staticName
+    (member2) => {
+      var _a;
+      return ((_a = member2.name) == null ? void 0 : _a.escapedText) === staticName;
+    }
   );
   if (!staticMember || !staticMember.body || !staticMember.body.statements) {
     return null;
@@ -241856,6 +241859,7 @@ var updateConstructor = (classNode, classMembers, statements, parameters) => {
   var _a, _b, _c;
   const constructorIndex = classMembers.findIndex((m) => m.kind === import_typescript4.default.SyntaxKind.Constructor);
   const constructorMethod = classMembers[constructorIndex];
+  if (constructorIndex < 0 && !(statements == null ? void 0 : statements.length) && !needsSuper(classNode)) return classMembers;
   if (constructorIndex >= 0 && import_typescript4.default.isConstructorDeclaration(constructorMethod)) {
     const constructorBodyStatements = (_b = (_a = constructorMethod.body) == null ? void 0 : _a.statements) != null ? _b : import_typescript4.default.factory.createNodeArray();
     const hasSuper = constructorBodyStatements.some((s) => s.kind === import_typescript4.default.SyntaxKind.SuperKeyword);
@@ -241892,16 +241896,18 @@ var createConstructorBodyWithSuper = () => {
     import_typescript4.default.factory.createCallExpression(import_typescript4.default.factory.createIdentifier("super"), void 0, void 0)
   );
 };
-var tsPropDeclNameAsString = (node, typeChecker) => {
+var tsPropDeclName = (node, typeChecker) => {
   const declarationName = import_typescript4.default.getNameOfDeclaration(node);
-  let memberName = declarationName.getText();
+  let staticName = declarationName.getText();
+  let dynamicName;
   if (import_typescript4.default.isComputedPropertyName(declarationName)) {
+    dynamicName = declarationName.expression.getText();
     const type = typeChecker.getTypeAtLocation(declarationName.expression);
     if (type != null && type.isLiteral()) {
-      memberName = type.value.toString();
+      staticName = type.value.toString();
     }
   }
-  return memberName;
+  return { staticName, dynamicName };
 };
 function getExternalStyles(style) {
   return style.externalStyles.map((s) => s.absolutePath).reverse().reduce((extStyles, styleUrl) => {
@@ -256900,6 +256906,7 @@ var getBuildFeatures = (cmps) => {
     member: cmps.some((c) => c.hasMember),
     method: cmps.some((c) => c.hasMethod),
     mode: cmps.some((c) => c.hasMode),
+    modernPropertyDecls: cmps.some((c) => c.hasModernPropertyDecls),
     observeAttribute: cmps.some((c) => c.hasAttribute || c.hasWatchCallback),
     prop: cmps.some((c) => c.hasProp),
     propBoolean: cmps.some((c) => c.hasPropBoolean),
@@ -258742,6 +258749,7 @@ var getLazyBuildConditionals = (config, cmps) => {
   build2.initializeNextTick = config.extras.initializeNextTick;
   const hasHydrateOutputTargets = config.outputTargets.some(isOutputTargetHydrate);
   build2.hydrateClientSide = hasHydrateOutputTargets;
+  build2.modernPropertyDecls = cmps.some((c) => c.hasModernPropertyDecls);
   updateBuildConditionals(config, build2);
   return build2;
 };
@@ -263057,7 +263065,7 @@ var attachInternalsDecoratorsToStatic = (diagnostics, decoratedMembers, newMembe
     return;
   }
   const [decoratedProp] = attachInternalsMembers;
-  const name = tsPropDeclNameAsString(decoratedProp, typeChecker);
+  const { staticName: name } = tsPropDeclName(decoratedProp, typeChecker);
   newMembers.push(createStaticGetter("attachInternalsMemberName", convertValueToLiteral(name)));
 };
 
@@ -263271,7 +263279,6 @@ var MEMBER_DECORATORS_TO_REMOVE = [
   "State",
   "Watch"
 ];
-var CONSTRUCTOR_DEFINED_MEMBER_DECORATORS = ["State", "Prop"];
 
 // src/compiler/transformers/decorators-to-static/element-decorator.ts
 var import_typescript46 = __toESM(require_typescript_5_5_4_bundle_cache_min());
@@ -264130,7 +264137,7 @@ var parsePropDecorator = (diagnostics, typeChecker, program, prop, decoratorName
   }
   const decoratorParams = getDecoratorParameters(propDecorator, typeChecker);
   const propOptions = decoratorParams[0] || {};
-  const propName = tsPropDeclNameAsString(prop, typeChecker);
+  const { staticName: propName, dynamicName: ogPropName } = tsPropDeclName(prop, typeChecker);
   if (isMemberPrivate(prop)) {
     const err2 = buildError(diagnostics);
     err2.messageText = 'Properties decorated with the @Prop() decorator cannot be "private" nor "protected". More info: https://rindojs.web.app/docs/properties';
@@ -264157,6 +264164,7 @@ var parsePropDecorator = (diagnostics, typeChecker, program, prop, decoratorName
     getter: import_typescript51.default.isGetAccessor(prop),
     setter: !!foundSetter
   };
+  if (ogPropName && ogPropName !== propName) propMeta.ogPropName = ogPropName;
   if (typeStr !== "unknown") {
     propMeta.attribute = getAttributeName(propName, propOptions);
     propMeta.reflect = getReflect(diagnostics, propDecorator, propOptions);
@@ -264307,11 +264315,10 @@ var stateDecoratorToStatic = (prop, typeChecker, decoratorName) => {
   if (stateDecorator == null) {
     return null;
   }
-  const stateName = tsPropDeclNameAsString(prop, typeChecker);
-  return import_typescript52.default.factory.createPropertyAssignment(
-    import_typescript52.default.factory.createStringLiteral(stateName),
-    import_typescript52.default.factory.createObjectLiteralExpression([], true)
-  );
+  const { staticName: stateName, dynamicName: ogPropName } = tsPropDeclName(prop, typeChecker);
+  const meta = {};
+  if (ogPropName && ogPropName !== stateName) meta.ogPropName = ogPropName;
+  return import_typescript52.default.factory.createPropertyAssignment(import_typescript52.default.factory.createStringLiteral(stateName), convertValueToLiteral(meta));
 };
 
 // src/compiler/transformers/decorators-to-static/watch-decorator.ts
@@ -264411,9 +264418,9 @@ var visitClassDeclaration = (config, diagnostics, typeChecker, program, classNod
       importAliasMap.get("AttachInternals")
     );
   }
-  const updatedClassFields = handleClassFields(classNode, filteredMethodsAndFields, typeChecker, importAliasMap);
   validateMethods(diagnostics, classMembers);
   const currentDecorators = retrieveTsDecorators(classNode);
+  const updatedClassFields = updateConstructor(classNode, filteredMethodsAndFields, []);
   return import_typescript54.default.factory.updateClassDeclaration(
     classNode,
     [
@@ -264431,7 +264438,7 @@ var visitClassDeclaration = (config, diagnostics, typeChecker, program, classNod
 };
 var removeRindoMethodDecorators = (classMembers, diagnostics, importAliasMap) => {
   return classMembers.map((member2) => {
-    var _a;
+    var _a, _b;
     const currentDecorators = retrieveTsDecorators(member2);
     const newDecorators = filterDecorators(
       currentDecorators,
@@ -264453,7 +264460,7 @@ var removeRindoMethodDecorators = (classMembers, diagnostics, importAliasMap) =>
       } else if (import_typescript54.default.isGetAccessor(member2)) {
         return import_typescript54.default.factory.updateGetAccessorDeclaration(
           member2,
-          import_typescript54.default.canHaveModifiers(member2) ? import_typescript54.default.getModifiers(member2) : void 0,
+          [...newDecorators != null ? newDecorators : [], ...(_b = retrieveTsModifiers(member2)) != null ? _b : []],
           member2.name,
           member2.parameters,
           member2.type,
@@ -264464,19 +264471,15 @@ var removeRindoMethodDecorators = (classMembers, diagnostics, importAliasMap) =>
         err2.messageText = "A get accessor should be decorated before a set accessor";
         augmentDiagnosticWithNode(err2, member2);
       } else if (import_typescript54.default.isPropertyDeclaration(member2)) {
-        if (shouldInitializeInConstructor(member2, importAliasMap)) {
-          return member2;
-        } else {
-          const modifiers = retrieveTsModifiers(member2);
-          return import_typescript54.default.factory.updatePropertyDeclaration(
-            member2,
-            [...newDecorators != null ? newDecorators : [], ...modifiers != null ? modifiers : []],
-            member2.name,
-            member2.questionToken,
-            member2.type,
-            member2.initializer
-          );
-        }
+        const modifiers = retrieveTsModifiers(member2);
+        return import_typescript54.default.factory.updatePropertyDeclaration(
+          member2,
+          [...newDecorators != null ? newDecorators : [], ...modifiers != null ? modifiers : []],
+          member2.name,
+          member2.questionToken,
+          member2.type,
+          member2.initializer
+        );
       } else {
         const err2 = buildError(diagnostics);
         err2.messageText = "Unknown class member encountered!";
@@ -264500,49 +264503,10 @@ var filterDecorators = (decorators, excludeList) => {
   }
   return decorators;
 };
-function handleClassFields(classNode, classMembers, typeChecker, importAliasMap) {
-  var _a;
-  const statements = [];
-  const updatedClassMembers = [];
-  for (const member2 of classMembers) {
-    if (shouldInitializeInConstructor(member2, importAliasMap) && import_typescript54.default.isPropertyDeclaration(member2)) {
-      const memberName = tsPropDeclNameAsString(member2, typeChecker);
-      statements.push(
-        import_typescript54.default.factory.createExpressionStatement(
-          import_typescript54.default.factory.createBinaryExpression(
-            import_typescript54.default.factory.createPropertyAccessExpression(import_typescript54.default.factory.createThis(), import_typescript54.default.factory.createIdentifier(memberName)),
-            import_typescript54.default.factory.createToken(import_typescript54.default.SyntaxKind.EqualsToken),
-            // if the member has no initializer we should default to setting it to
-            // just 'undefined'
-            (_a = member2.initializer) != null ? _a : import_typescript54.default.factory.createIdentifier("undefined")
-          )
-        )
-      );
-    } else {
-      updatedClassMembers.push(member2);
-    }
-  }
-  if (statements.length === 0) {
-    return updatedClassMembers;
-  } else {
-    return updateConstructor(classNode, updatedClassMembers, statements);
-  }
-}
-var shouldInitializeInConstructor = (member2, importAliasMap) => {
-  const currentDecorators = retrieveTsDecorators(member2);
-  if (currentDecorators === void 0) {
-    return false;
-  }
-  const filteredDecorators = filterDecorators(
-    currentDecorators,
-    CONSTRUCTOR_DEFINED_MEMBER_DECORATORS.map((decorator) => importAliasMap.get(decorator))
-  );
-  return currentDecorators !== filteredDecorators;
-};
 
 // src/compiler/transformers/static-to-meta/parse-static.ts
 var import_path51 = require("path");
-var import_typescript62 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript63 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/compiler/transformers/static-to-meta/call-expression.ts
 var import_typescript56 = __toESM(require_typescript_5_5_4_bundle_cache_min());
@@ -264663,7 +264627,7 @@ var visitCallExpressionArg = (m, arg) => {
 
 // src/compiler/transformers/static-to-meta/component.ts
 var import_path47 = require("path");
-var import_typescript59 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript60 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/compiler/transformers/add-component-meta-static.ts
 var import_typescript57 = __toESM(require_typescript_5_5_4_bundle_cache_min());
@@ -264735,6 +264699,27 @@ var setComponentBuildConditionals = (cmpMeta) => {
   cmpMeta.isPlain = !cmpMeta.hasMember && !cmpMeta.hasStyle && !cmpMeta.hasLifecycle && !cmpMeta.hasListener && !cmpMeta.hasVdomRender;
 };
 
+// src/compiler/transformers/detect-modern-prop-decls.ts
+var import_typescript58 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var detectModernPropDeclarations = (classNode, cmp) => {
+  const parsedProps = getStaticValue(classNode.members, "properties");
+  const parsedStates = getStaticValue(classNode.members, "states");
+  if (!parsedProps && !parsedStates) {
+    cmp.hasModernPropertyDecls = false;
+    return;
+  }
+  const members = [...Object.entries(parsedProps || {}), ...Object.entries(parsedStates || {})];
+  for (const [propName, meta] of members) {
+    const dynamicPropName = meta.ogPropName || "";
+    const prop = classNode.members.find((m) => {
+      return import_typescript58.default.isPropertyDeclaration(m) && (import_typescript58.default.isComputedPropertyName(m.name) && m.name.expression.getText() === dynamicPropName || m.name.getText() === propName);
+    });
+    if (!prop) continue;
+    cmp.hasModernPropertyDecls = true;
+    break;
+  }
+};
+
 // src/compiler/transformers/static-to-meta/attach-internals.ts
 var parseAttachInternals = (staticMembers) => {
   const parsedAttachInternalsMemberName = getStaticValue(staticMembers, "attachInternalsMemberName");
@@ -264746,13 +264731,13 @@ var parseAttachInternals = (staticMembers) => {
 };
 
 // src/compiler/transformers/static-to-meta/class-methods.ts
-var import_typescript58 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript59 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var parseClassMethods = (cmpNode, cmpMeta) => {
   const classMembers = cmpNode.members;
   if (!classMembers || classMembers.length === 0) {
     return;
   }
-  const classMethods = classMembers.filter((m) => import_typescript58.default.isMethodDeclaration(m));
+  const classMethods = classMembers.filter((m) => import_typescript59.default.isMethodDeclaration(m));
   if (classMethods.length === 0) {
     return;
   }
@@ -265116,6 +265101,7 @@ var parseStaticComponentMeta = (compilerCtx, typeChecker, cmpNode, moduleFile, t
     hasMember: false,
     hasMethod: false,
     hasMode: false,
+    hasModernPropertyDecls: false,
     hasAttribute: false,
     hasProp: false,
     hasPropNumber: false,
@@ -265151,15 +265137,16 @@ var parseStaticComponentMeta = (compilerCtx, typeChecker, cmpNode, moduleFile, t
   };
   const visitComponentChildNode = (node) => {
     validateComponentMembers(node);
-    if (import_typescript59.default.isCallExpression(node)) {
+    if (import_typescript60.default.isCallExpression(node)) {
       parseCallExpression(cmp, node);
-    } else if (import_typescript59.default.isStringLiteral(node)) {
+    } else if (import_typescript60.default.isStringLiteral(node)) {
       parseStringLiteral(cmp, node);
     }
     node.forEachChild(visitComponentChildNode);
   };
   visitComponentChildNode(cmpNode);
   parseClassMethods(cmpNode, cmp);
+  detectModernPropDeclarations(cmpNode, cmp);
   cmp.htmlAttrNames = unique(cmp.htmlAttrNames);
   cmp.htmlTagNames = unique(cmp.htmlTagNames);
   cmp.potentialCmpRefs = unique(cmp.potentialCmpRefs);
@@ -265167,7 +265154,11 @@ var parseStaticComponentMeta = (compilerCtx, typeChecker, cmpNode, moduleFile, t
   if (transformOpts && transformOpts.componentMetadata === "compilerstatic") {
     cmpNode = addComponentMetaStatic(cmpNode, cmp);
   }
-  moduleFile.cmps.push(cmp);
+  const foundIndex = moduleFile.cmps.findIndex(
+    (c) => c.tagName === cmp.tagName && c.sourceFilePath === cmp.sourceFilePath
+  );
+  if (foundIndex > -1) moduleFile.cmps[foundIndex] = cmp;
+  else moduleFile.cmps.push(cmp);
   compilerCtx.nodeMap.set(cmpNode, cmp);
   return cmpNode;
 };
@@ -265176,15 +265167,15 @@ var validateComponentMembers = (node) => {
     /**
      * the component has a getter called "shadowRoot"
      */
-    import_typescript59.default.isGetAccessorDeclaration(node) && import_typescript59.default.isIdentifier(node.name) && typeof node.name.escapedText === "string" && BLACKLISTED_COMPONENT_METHODS.includes(node.name.escapedText) && /**
+    import_typescript60.default.isGetAccessorDeclaration(node) && import_typescript60.default.isIdentifier(node.name) && typeof node.name.escapedText === "string" && BLACKLISTED_COMPONENT_METHODS.includes(node.name.escapedText) && /**
      * the parent node is a class declaration
      */
-    node.parent && import_typescript59.default.isClassDeclaration(node.parent)
+    node.parent && import_typescript60.default.isClassDeclaration(node.parent)
   ) {
     const propName = node.name.escapedText;
-    const decorator = import_typescript59.default.getDecorators(node.parent)[0];
-    if (import_typescript59.default.isCallExpression(decorator.expression) && decorator.expression.arguments.length === 1 && import_typescript59.default.isObjectLiteralExpression(decorator.expression.arguments[0]) && decorator.expression.arguments[0].properties.some(
-      (prop) => import_typescript59.default.isPropertyAssignment(prop) && prop.name.getText() === "tag"
+    const decorator = import_typescript60.default.getDecorators(node.parent)[0];
+    if (import_typescript60.default.isCallExpression(decorator.expression) && decorator.expression.arguments.length === 1 && import_typescript60.default.isObjectLiteralExpression(decorator.expression.arguments[0]) && decorator.expression.arguments[0].properties.some(
+      (prop) => import_typescript60.default.isPropertyAssignment(prop) && prop.name.getText() === "tag"
     )) {
       const componentName = node.parent.name.getText();
       throw new Error(
@@ -265230,7 +265221,7 @@ var parseAssetsDirs = (staticMembers, componentFilePath) => {
 
 // src/compiler/transformers/static-to-meta/import.ts
 var import_path50 = require("path");
-var import_typescript61 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript62 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/compiler/transformers/collections/add-external-import.ts
 var import_path49 = require("path");
@@ -265239,7 +265230,7 @@ var import_path49 = require("path");
 var import_path48 = require("path");
 
 // src/compiler/transformers/collections/parse-collection-components.ts
-var import_typescript60 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript61 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var parseCollectionComponents = (config, compilerCtx, buildCtx, collectionDir, collectionManifest, collection) => {
   if (collectionManifest.entries) {
     collectionManifest.entries.forEach((entryPath) => {
@@ -265250,7 +265241,7 @@ var parseCollectionComponents = (config, compilerCtx, buildCtx, collectionDir, c
 };
 var transpileCollectionModule = (config, compilerCtx, buildCtx, collection, inputFileName) => {
   const sourceText = compilerCtx.fs.readFileSync(inputFileName);
-  const sourceFile = import_typescript60.default.createSourceFile(inputFileName, sourceText, import_typescript60.default.ScriptTarget.ES2017, true, import_typescript60.default.ScriptKind.JS);
+  const sourceFile = import_typescript61.default.createSourceFile(inputFileName, sourceText, import_typescript61.default.ScriptTarget.ES2017, true, import_typescript61.default.ScriptKind.JS);
   return updateModule(config, compilerCtx, buildCtx, sourceFile, sourceText, inputFileName, void 0, collection);
 };
 
@@ -265398,7 +265389,7 @@ var addExternalImport = (config, compilerCtx, buildCtx, moduleFile, containingFi
 
 // src/compiler/transformers/static-to-meta/import.ts
 var parseModuleImport = (config, compilerCtx, buildCtx, moduleFile, dirPath, importNode, resolveCollections) => {
-  if (importNode.moduleSpecifier && import_typescript61.default.isStringLiteral(importNode.moduleSpecifier)) {
+  if (importNode.moduleSpecifier && import_typescript62.default.isStringLiteral(importNode.moduleSpecifier)) {
     let importPath = importNode.moduleSpecifier.text;
     if (!moduleFile.originalImports.includes(importPath)) {
       moduleFile.originalImports.push(importPath);
@@ -265434,6 +265425,7 @@ var updateModule = (config, compilerCtx, buildCtx, tsSourceFile, sourceFileText,
   const emitFileName = (0, import_path51.basename)(emitFilePath);
   emitFilePath = normalizePath(join(srcDirPath, emitFileName));
   const moduleFile = createModule(tsSourceFile, sourceFileText, emitFilePath);
+  if (prevModuleFile == null ? void 0 : prevModuleFile.cmps) moduleFile.cmps = prevModuleFile.cmps;
   if (emitFilePath.endsWith(".js.map")) {
     moduleFile.sourceMapPath = emitFilePath;
     moduleFile.sourceMapFileText = sourceFileText;
@@ -265445,15 +265437,15 @@ var updateModule = (config, compilerCtx, buildCtx, tsSourceFile, sourceFileText,
   compilerCtx.moduleMap.set(moduleFileKey, moduleFile);
   compilerCtx.changedModules.add(moduleFile.sourceFilePath);
   const visitNode = (node) => {
-    if (import_typescript62.default.isClassDeclaration(node)) {
+    if (import_typescript63.default.isClassDeclaration(node)) {
       parseStaticComponentMeta(compilerCtx, typeChecker, node, moduleFile);
       return;
-    } else if (import_typescript62.default.isImportDeclaration(node)) {
+    } else if (import_typescript63.default.isImportDeclaration(node)) {
       parseModuleImport(config, compilerCtx, buildCtx, moduleFile, srcDirPath, node, true);
       return;
-    } else if (import_typescript62.default.isCallExpression(node)) {
+    } else if (import_typescript63.default.isCallExpression(node)) {
       parseCallExpression(moduleFile, node);
-    } else if (import_typescript62.default.isStringLiteral(node)) {
+    } else if (import_typescript63.default.isStringLiteral(node)) {
       parseStringLiteral(moduleFile, node);
     }
     node.forEachChild(visitNode);
@@ -265465,12 +265457,12 @@ var updateModule = (config, compilerCtx, buildCtx, tsSourceFile, sourceFileText,
   }
   visitNode(tsSourceFile);
   if (moduleFile.cmps.length > 0) {
-    moduleFile.staticSourceFile = import_typescript62.default.createSourceFile(
+    moduleFile.staticSourceFile = import_typescript63.default.createSourceFile(
       sourceFilePath,
       sourceFileText,
       tsSourceFile.languageVersion,
       true,
-      import_typescript62.default.ScriptKind.JS
+      import_typescript63.default.ScriptKind.JS
     );
   }
   return moduleFile;
@@ -266713,7 +266705,7 @@ var isWatchIgnorePath = (config, path6) => {
 };
 
 // src/compiler/transpile/create-watch-program.ts
-var import_typescript63 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript64 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var createTsWatchProgram = async (config, buildCallback) => {
   let isRunning = false;
   let lastTsBuilder;
@@ -266721,7 +266713,7 @@ var createTsWatchProgram = async (config, buildCallback) => {
   let rebuildTimer;
   const optionsToExtend = getTsOptionsToExtend(config);
   const tsWatchSys = {
-    ...import_typescript63.default.sys,
+    ...import_typescript64.default.sys,
     /**
      * Override the default `setTimeout` implementation in the {@link ts.System}. The reasoning
      * behind this change is not explicitly clear, but this appears to be related to debouncing
@@ -266749,7 +266741,7 @@ var createTsWatchProgram = async (config, buildCallback) => {
     }
   };
   config.sys.addDestroy(() => tsWatchSys.clearTimeout(timeoutId));
-  const tsWatchHost = import_typescript63.default.createWatchCompilerHost(
+  const tsWatchHost = import_typescript64.default.createWatchCompilerHost(
     // Use the TS config from the Rindo project
     config.tsconfig,
     optionsToExtend,
@@ -266757,7 +266749,7 @@ var createTsWatchProgram = async (config, buildCallback) => {
     // We use the `createEmitAndSemanticDiagnosticsBuilderProgram` as opposed to the
     // `createSemanticDiagnosticsBuilderProgram` because we need our program to emit
     // output files in addition to checking for errors
-    import_typescript63.default.createEmitAndSemanticDiagnosticsBuilderProgram,
+    import_typescript64.default.createEmitAndSemanticDiagnosticsBuilderProgram,
     // Add a callback to log out diagnostics as the program runs
     (reportDiagnostic) => {
       config.logger.debug("watch reportDiagnostic:" + reportDiagnostic.messageText);
@@ -266784,7 +266776,7 @@ var createTsWatchProgram = async (config, buildCallback) => {
     // Create the watch builder program instance and make it available on the
     // returned object. This provides us an easy way to teardown the program
     // down-the-road.
-    program: import_typescript63.default.createWatchProgram(tsWatchHost),
+    program: import_typescript64.default.createWatchProgram(tsWatchHost),
     // This will be called via a callback on the watch build whenever a file
     // change is detected
     rebuild: () => {
@@ -268828,7 +268820,7 @@ var extname8 = (str) => {
 var SKIP_EXT = /* @__PURE__ */ new Set(["zip", "rar", "tar", "gz", "bz2", "png", "jpeg", "jpg", "gif", "pdf", "tiff", "psd"]);
 
 // src/compiler/sys/node-require.ts
-var import_typescript64 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript65 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var nodeRequire = (id) => {
   const results = {
     module: void 0,
@@ -268843,13 +268835,13 @@ var nodeRequire = (id) => {
     require.extensions[".ts"] = (module2, fileName) => {
       let sourceText = fs3.readFileSync(fileName, "utf8");
       if (fileName.endsWith(".ts")) {
-        const tsResults = import_typescript64.default.transpileModule(sourceText, {
+        const tsResults = import_typescript65.default.transpileModule(sourceText, {
           fileName,
           compilerOptions: {
-            module: import_typescript64.default.ModuleKind.CommonJS,
-            moduleResolution: import_typescript64.default.ModuleResolutionKind.NodeJs,
+            module: import_typescript65.default.ModuleKind.CommonJS,
+            moduleResolution: import_typescript65.default.ModuleResolutionKind.NodeJs,
             esModuleInterop: true,
-            target: import_typescript64.default.ScriptTarget.ES2017,
+            target: import_typescript65.default.ScriptTarget.ES2017,
             allowJs: true
           }
         });
@@ -269651,7 +269643,7 @@ var createCompiler = async (userConfig) => {
   const sys = config.sys;
   const compilerCtx = new CompilerContext();
   if (isFunction(config.sys.setupCompiler)) {
-    config.sys.setupCompiler({ ts: import_typescript65.default });
+    config.sys.setupCompiler({ ts: import_typescript66.default });
   }
   compilerCtx.fs = createInMemoryFs(sys);
   compilerCtx.cache = new Cache(config, createInMemoryFs(sys));
@@ -269685,7 +269677,7 @@ var import_path63 = require("path");
 
 // src/compiler/sys/typescript/typescript-config.ts
 var import_path62 = require("path");
-var import_typescript66 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript67 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var validateTsConfig = async (config, sys, init) => {
   var _a;
   const tsconfig = {
@@ -269707,7 +269699,7 @@ var validateTsConfig = async (config, sys, init) => {
     } else {
       tsconfig.path = readTsConfig.path;
       const host = {
-        ...import_typescript66.default.sys,
+        ...import_typescript67.default.sys,
         readFile: (p) => {
           if (p === tsconfig.path) {
             return readTsConfig.content;
@@ -269718,7 +269710,7 @@ var validateTsConfig = async (config, sys, init) => {
         fileExists: (p) => sys.accessSync(p),
         onUnRecoverableConfigFileDiagnostic: (e) => console.error(e)
       };
-      const results = import_typescript66.default.getParsedCommandLineOfConfigFile(tsconfig.path, {}, host);
+      const results = import_typescript67.default.getParsedCommandLineOfConfigFile(tsconfig.path, {}, host);
       if (results === void 0) {
         throw "Encountered an error reading tsconfig!";
       }
@@ -269762,12 +269754,12 @@ var validateTsConfig = async (config, sys, init) => {
         }
         if (results.options) {
           tsconfig.compilerOptions = results.options;
-          const target = (_a = tsconfig.compilerOptions.target) != null ? _a : import_typescript66.default.ScriptTarget.ES5;
-          if ([import_typescript66.default.ScriptTarget.ES3, import_typescript66.default.ScriptTarget.ES5, import_typescript66.default.ScriptTarget.ES2015, import_typescript66.default.ScriptTarget.ES2016].includes(target)) {
+          const target = (_a = tsconfig.compilerOptions.target) != null ? _a : import_typescript67.default.ScriptTarget.ES5;
+          if ([import_typescript67.default.ScriptTarget.ES3, import_typescript67.default.ScriptTarget.ES5, import_typescript67.default.ScriptTarget.ES2015, import_typescript67.default.ScriptTarget.ES2016].includes(target)) {
             const warn = buildWarn(tsconfig.diagnostics);
             warn.messageText = `To improve bundling, it is always recommended to set the tsconfig.json \u201Ctarget\u201D setting to "es2017". Note that the compiler will automatically handle transpilation for ES5-only browsers.`;
           }
-          if (tsconfig.compilerOptions.module !== import_typescript66.default.ModuleKind.ESNext && !config._isTesting) {
+          if (tsconfig.compilerOptions.module !== import_typescript67.default.ModuleKind.ESNext && !config._isTesting) {
             const warn = buildWarn(tsconfig.diagnostics);
             warn.messageText = `To improve bundling, it is always recommended to set the tsconfig.json \u201Cmodule\u201D setting to \u201Cesnext\u201D. Note that the compiler will automatically handle bundling both modern and legacy builds.`;
           }
@@ -271164,26 +271156,26 @@ var VALID_TARGET = /* @__PURE__ */ new Set(["latest", "esnext", "es2020", "es201
 
 // src/compiler/transpile/transpile-module.ts
 var import_sys_api_node5 = require("../sys/node/index.js");
-var import_typescript68 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript69 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 
 // src/compiler/transformers/static-to-meta/visitor.ts
 var import_path67 = require("path");
-var import_typescript67 = __toESM(require_typescript_5_5_4_bundle_cache_min());
+var import_typescript68 = __toESM(require_typescript_5_5_4_bundle_cache_min());
 var convertStaticToMeta = (config, compilerCtx, buildCtx, typeChecker, collection, transformOpts) => {
   return (transformCtx) => {
     let dirPath;
     let moduleFile;
     const visitNode = (node) => {
-      if (import_typescript67.default.isClassDeclaration(node)) {
+      if (import_typescript68.default.isClassDeclaration(node)) {
         return parseStaticComponentMeta(compilerCtx, typeChecker, node, moduleFile, transformOpts);
-      } else if (import_typescript67.default.isImportDeclaration(node)) {
+      } else if (import_typescript68.default.isImportDeclaration(node)) {
         parseModuleImport(config, compilerCtx, buildCtx, moduleFile, dirPath, node, !transformOpts.isolatedModules);
-      } else if (import_typescript67.default.isCallExpression(node)) {
+      } else if (import_typescript68.default.isCallExpression(node)) {
         parseCallExpression(moduleFile, node);
-      } else if (import_typescript67.default.isStringLiteral(node)) {
+      } else if (import_typescript68.default.isStringLiteral(node)) {
         parseStringLiteral(moduleFile, node);
       }
-      return import_typescript67.default.visitEachChild(node, visitNode, transformCtx);
+      return import_typescript68.default.visitEachChild(node, visitNode, transformCtx);
     };
     return (tsSourceFile) => {
       dirPath = (0, import_path67.dirname)(tsSourceFile.fileName);
@@ -271229,13 +271221,13 @@ var transpileModule = (config, input, transformOpts) => {
     moduleFile: null
   };
   if (transformOpts.module === "cjs") {
-    tsCompilerOptions.module = import_typescript68.default.ModuleKind.CommonJS;
+    tsCompilerOptions.module = import_typescript69.default.ModuleKind.CommonJS;
   } else {
-    tsCompilerOptions.module = import_typescript68.default.ModuleKind.ESNext;
+    tsCompilerOptions.module = import_typescript69.default.ModuleKind.ESNext;
   }
   tsCompilerOptions.target = getScriptTargetKind(transformOpts);
   if ((sourceFilePath.endsWith(".tsx") || sourceFilePath.endsWith(".jsx")) && tsCompilerOptions.jsx == null) {
-    tsCompilerOptions.jsx = import_typescript68.default.JsxEmit.React;
+    tsCompilerOptions.jsx = import_typescript69.default.JsxEmit.React;
   }
   if (tsCompilerOptions.jsx != null && !isString(tsCompilerOptions.jsxFactory)) {
     tsCompilerOptions.jsxFactory = "h";
@@ -271246,7 +271238,7 @@ var transpileModule = (config, input, transformOpts) => {
   if (tsCompilerOptions.paths && !isString(tsCompilerOptions.baseUrl)) {
     tsCompilerOptions.baseUrl = ".";
   }
-  const sourceFile = import_typescript68.default.createSourceFile(sourceFilePath, input, tsCompilerOptions.target);
+  const sourceFile = import_typescript69.default.createSourceFile(sourceFilePath, input, tsCompilerOptions.target);
   const compilerHost = {
     getSourceFile: (fileName) => {
       return normalizePath(fileName) === normalizePath(sourceFilePath) ? sourceFile : void 0;
@@ -271262,13 +271254,13 @@ var transpileModule = (config, input, transformOpts) => {
     useCaseSensitiveFileNames: () => false,
     getCanonicalFileName: (fileName) => fileName,
     getCurrentDirectory: () => transformOpts.currentDirectory || process.cwd(),
-    getNewLine: () => import_typescript68.default.sys.newLine || "\n",
+    getNewLine: () => import_typescript69.default.sys.newLine || "\n",
     fileExists: (fileName) => normalizePath(fileName) === normalizePath(sourceFilePath),
     readFile: () => "",
     directoryExists: () => true,
     getDirectories: () => []
   };
-  const program = import_typescript68.default.createProgram([sourceFilePath], tsCompilerOptions, compilerHost);
+  const program = import_typescript69.default.createProgram([sourceFilePath], tsCompilerOptions, compilerHost);
   const typeChecker = program.getTypeChecker();
   const transformers = {
     before: [
@@ -271300,10 +271292,10 @@ var transpileModule = (config, input, transformOpts) => {
 };
 var getScriptTargetKind = (transformOpts) => {
   const target = transformOpts.target && transformOpts.target.toUpperCase();
-  if (isNumber(import_typescript68.default.ScriptTarget[target])) {
-    return import_typescript68.default.ScriptTarget[target];
+  if (isNumber(import_typescript69.default.ScriptTarget[target])) {
+    return import_typescript69.default.ScriptTarget[target];
   }
-  return import_typescript68.default.ScriptTarget.Latest;
+  return import_typescript69.default.ScriptTarget.Latest;
 };
 
 // src/compiler/transpile.ts