@shapeshift-labs/frontier-lang-compiler 0.2.98 → 0.2.100

package/dist/native-region-scanner-js-helpers.js

@@ -121,10 +121,64 @@ function jsRegionKindForDeclarationName(name, source = '') {
 function jsExportedContainerDeclaration(input, lineNumber, trimmed) {
   let match = trimmed.match(/^export\s+default\s+(.+)$/);
   if (match) return jsContainerExport(input, lineNumber, 'ExportDefaultContainer', 'default', match[1], { exportDefault: true });
-  match = trimmed.match(/^(?:module\.)?exports(?:\.([A-Za-z_$][\w$]*))?\s*=\s*(.+)$/);
+  match = trimmed.match(/^(module\.exports|exports)(?:\.([A-Za-z_$][\w$]*))?\s*=\s*(.+)$/);
   if (!match) return undefined;
-  const name = match[1] ? `exports.${match[1]}` : 'module.exports';
-  return jsContainerExport(input, lineNumber, 'CommonJsContainerExport', name, match[2], { export: 'commonjs' });
+  const name = match[2] ? `${match[1]}.${match[2]}` : 'module.exports';
+  return jsContainerExport(input, lineNumber, 'CommonJsContainerExport', name, match[3], { export: 'commonjs' });
+}
+
+function jsExportedFunctionWrapperDeclaration(input, lineNumber, trimmed) {
+  const match = trimmed.match(/^export\s+default\s+((?:React\.)?(?:forwardRef|memo|lazy|observer))\s*(?:<[^>]+>)?\s*\(\s*(.+)$/);
+  if (!match) return undefined;
+  const wrapper = match[1];
+  const argument = match[2].trim();
+  let functionMatch = argument.match(/^(?:async\s+)?function\*?\s*([A-Za-z_$][\w$]*)?\s*(?:<[^({;]+>)?\s*\(([^)]*)\)/);
+  if (functionMatch) {
+    return nativeDeclaration(input, lineNumber, 'ExportDefaultFunctionWrapperDeclaration', 'function', functionMatch[1] ?? 'default', {
+      exportDefault: true,
+      wrapper,
+      parameters: splitParameters(functionMatch[2])
+    }, true);
+  }
+  functionMatch = argument.match(/^(?:async\s*)?(?:\(([^)]*)\)|([A-Za-z_$][\w$]*))\s*(?::\s*[^=]+)?=>/);
+  if (functionMatch) {
+    return nativeDeclaration(input, lineNumber, 'ExportDefaultFunctionWrapperDeclaration', 'function', 'default', {
+      exportDefault: true,
+      wrapper,
+      parameters: splitParameters(functionMatch[1] ?? functionMatch[2])
+    }, true);
+  }
+  const aliasMatch = argument.match(/^([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*(?:[,)]|$)/);
+  if (!aliasMatch) return undefined;
+  return nativeDeclaration(input, lineNumber, 'ExportDefaultWrappedAlias', 'variable', 'default', {
+    exportDefault: true,
+    wrapper,
+    alias: aliasMatch[1],
+    initializerKind: 'function-wrapper'
+  }, false, {
+    metadata: { exportDefault: true, wrapper, alias: aliasMatch[1], initializerKind: 'function-wrapper' }
+  });
+}
+
+function jsExportAliasDeclaration(input, lineNumber, trimmed) {
+  let match = trimmed.match(/^export\s+default\s+([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*;?$/);
+  if (match) return jsAliasExport(input, lineNumber, 'ExportDefaultAlias', 'default', match[1], { exportDefault: true }, trimmed);
+  match = trimmed.match(/^module\.exports\s*=\s*([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*;?$/);
+  if (match) return jsAliasExport(input, lineNumber, 'CommonJsAliasExport', 'module.exports', match[1], { export: 'commonjs' }, trimmed);
+  match = trimmed.match(/^(?:module\.)?exports\.([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*;?$/);
+  if (!match) return undefined;
+  return jsAliasExport(input, lineNumber, 'CommonJsAliasExport', match[1], match[2], { export: 'commonjs' }, trimmed);
+}
+
+function jsAliasExport(input, lineNumber, languageKind, name, alias, fields, source) {
+  const regionKind = jsRegionKindForDeclarationName(name, source);
+  return nativeDeclaration(input, lineNumber, languageKind, 'variable', name, {
+    ...fields,
+    alias
+  }, false, {
+    regionKind,
+    metadata: { ...fields, alias }
+  });
 }
 
 function jsContainerExport(input, lineNumber, languageKind, name, initializer, fields) {
@@ -254,17 +308,7 @@ function findUnescapedBacktick(text, startIndex) {
   return -1;
 }
 
-export {
-  jsCommentOnlyLine,
-  jsContainerDelta,
-  jsDeclarationScanLine,
-  jsExportedContainerDeclaration,
-  jsInitializerKind,
-  jsImportDeclarations,
-  jsObjectPropertyDeclaration,
-  jsObjectRegionContext,
-  jsRegionKindForDeclarationName,
-  jsRouteRecordDeclaration,
-  jsVariableHasBody,
-  jsVariableSymbolKind
-};
+export { jsCommentOnlyLine, jsContainerDelta, jsDeclarationScanLine };
+export { jsExportAliasDeclaration, jsExportedContainerDeclaration, jsExportedFunctionWrapperDeclaration };
+export { jsInitializerKind, jsImportDeclarations, jsObjectPropertyDeclaration, jsObjectRegionContext };
+export { jsRegionKindForDeclarationName, jsRouteRecordDeclaration, jsVariableHasBody, jsVariableSymbolKind };

package/dist/native-region-scanner-js.js

@@ -10,7 +10,9 @@ import {
   jsCommentOnlyLine,
   jsContainerDelta,
   jsDeclarationScanLine,
+  jsExportAliasDeclaration,
   jsExportedContainerDeclaration,
+  jsExportedFunctionWrapperDeclaration,
   jsInitializerKind,
   jsImportDeclarations,
   jsObjectPropertyDeclaration,
@@ -75,11 +77,13 @@ function scanJavaScriptLike(input) {
       pushDeclaration(nativeDeclaration(input, number, 'FunctionDeclaration', 'function', match[1], { parameters: splitParameters(match[2]) }, declarationLine.includes('{')));
     } else if ((match = trimmed.match(/^export\s+default\s+(?:async\s+)?function\*?\s*([A-Za-z_$][\w$]*)?\s*(?:<[^({;]+>)?\s*\(([^)]*)\)\s*(?::\s*[^={]+)?/))) {
       pushDeclaration(nativeDeclaration(input, number, 'ExportDefaultFunctionDeclaration', 'function', match[1] ?? 'default', { parameters: splitParameters(match[2]), exportDefault: true }, trimmed.includes('{')));
-    } else if ((match = declarationLine.match(/^(?:default\s+)?(?:abstract\s+)?class\s+([A-Za-z_$][\w$]*)/))) {
-      pushDeclaration(nativeDeclaration(input, number, declarationLine.startsWith('default ') ? 'ExportDefaultClassDeclaration' : 'ClassDeclaration', 'class', match[1], { exportDefault: declarationLine.startsWith('default ') || undefined }, declarationLine.includes('{')));
-      pushDeclarations(jsInlineClassMemberDeclarations(input, number, declarationLine, match[1]));
+    } else if ((match = declarationLine.match(/^(default\s+)?(?:abstract\s+)?class\b(?:\s+(?!(?:extends|implements)\b)([A-Za-z_$][\w$]*))?/)) && (match[1] || match[2])) {
+      const className = match[2] ?? 'default';
+      const exportDefault = Boolean(match[1]);
+      pushDeclaration(nativeDeclaration(input, number, exportDefault ? 'ExportDefaultClassDeclaration' : 'ClassDeclaration', 'class', className, { exportDefault: exportDefault || undefined }, declarationLine.includes('{')));
+      pushDeclarations(jsInlineClassMemberDeclarations(input, number, declarationLine, className));
       if (jsStructureDelta(declarationLine).value > 0) {
-        currentClass = match[1];
+        currentClass = className;
         classDepth = 0;
       }
     } else if ((match = declarationLine.match(/^interface\s+([A-Za-z_$][\w$]*)/))) {
@@ -109,10 +113,14 @@ function scanJavaScriptLike(input) {
       pushDeclarations(jsInlineNestedObjectDeclarations(input, number, declarationLine, declarations[declarations.length - 1]));
       const objectContext = jsObjectRegionContext(match[1], declarationLine, number, regionKind);
       if (objectContext) objectStack.push(objectContext);
+    } else if ((match = jsExportedFunctionWrapperDeclaration(input, number, trimmed))) {
+      pushDeclaration(match);
     } else if ((match = jsExportedContainerDeclaration(input, number, trimmed))) {
       pushDeclaration(match.declaration);
       pushDeclarations(jsInlineNestedObjectDeclarations(input, number, trimmed, match.declaration));
       if (match.context) objectStack.push(match.context);
+    } else if ((match = jsExportAliasDeclaration(input, number, trimmed))) {
+      pushDeclaration(match);
     } else if ((match = trimmed.match(/^(?:module\.)?exports\.([A-Za-z_$][\w$]*)\s*=\s*(?:async\s+)?function\*?\s*\(([^)]*)\)/))) {
       pushDeclaration(nativeDeclaration(input, number, 'CommonJsFunctionExport', 'function', match[1], { parameters: splitParameters(match[2]) }, true));
     } else if ((match = trimmed.match(/^(?:module\.)?exports\.([A-Za-z_$][\w$]*)\s*=/))) {

package/dist/semantic-import-regions.js

@@ -1,4 +1,4 @@
-import { idFragment, uniqueStrings } from './native-import-utils.js';
+import { caseSensitiveIdFragment, idFragment, uniqueStrings } from './native-import-utils.js';
 
 const NativeImportRegionTaxonomyKinds = Object.freeze([
   'symbol',
@@ -27,7 +27,7 @@ function semanticOwnershipRegionForSymbol(imported, symbol, mapping, nativeNode,
     symbol.name ?? symbol.id
   ].map((part) => String(part).replace(/\s+/g, ' ').trim()).join('#');
   return {
-    id: `region_${idFragment(key)}`,
+    id: `region_${caseSensitiveIdFragment(key)}`,
     key,
     regionKind,
     granularity: 'symbol',
@@ -54,7 +54,7 @@ function semanticOwnershipRegionForDeclaration(input, declaration, documentId) {
   const regionKind = semanticRegionKindForDeclaration(declaration);
   const key = ['source', sourcePath, regionKind, name].map((part) => String(part).replace(/\s+/g, ' ').trim()).join('#');
   return {
-    id: `region_${idFragment(key)}`,
+    id: `region_${caseSensitiveIdFragment(key)}`,
     key,
     regionKind,
     granularity: 'symbol',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.98",
+  "version": "0.2.100",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",