@veloceapps/sdk 8.0.0-176 → 8.0.0-178

package/fesm2020/veloceapps-sdk-cms.mjs

@@ -1668,22 +1668,26 @@ const vendorMap = {
     lodash: lodash,
 };
 
-const importRegexp = new RegExp(`import([ \\n\\t]*(?:[^ \\n\\t\\{\\}]+[ \\n\\t]*,?)?(?:[ \\n\\t]*\\{(?:[ \\n\\t]*[^ \\n\\t"'\\{\\}]+[ \\n\\t]*,?)+\\})?[ \\n\\t]*)from[ \\n\\t]*(['"])([^'"\\n]+)(?:['"]);`, 'g');
+const importRegexp = new RegExp(`import\\s+(?:{[^{}]+}|.*?)\\s*(?:from)?\\s*['"].*?['"]|import\\(.*?\\)`, 'g');
+const importPartsRegexp = new RegExp(`import ([\\n\\t]*(?:[^ \\n\\t\\{\\}]+[ \\n\\t]*,?)?(?:[ \\n\\t]*\\{(?:[ \\n\\t]*[^ \\n\\t"'\\{\\}]+[ \\n\\t]*,?)+\\})?[\\n\\t]*) from[ \\n\\t]*(['"])([^'"\\n]+)(?:['"])`, 'g');
 const normalizeImports = (script, elementPath) => {
-    const result = script.replace(importRegexp, (match, g1, g2, src) => {
-        const imports = g1
-            .trim()
-            .slice(1, -1)
-            .split(',')
-            .map(item => item.trim());
-        imports.forEach(item => {
-            if (!vendorMap[src]?.[item]) {
-                throw new Error(`Failed to import ${item} from '${src}' in ${elementPath}/script.ts`);
-            }
+    return script.replace(importRegexp, match => {
+        return match.replace(importPartsRegexp, (_, g1, __, src) => {
+            const strObj = g1.replace(/ as /g, ': ').trim();
+            const imports = strObj
+                .slice(1, -1)
+                .split(',')
+                .map(item => item.split(':')[0])
+                .filter(isDefined)
+                .map(item => item.trim());
+            imports.forEach(item => {
+                if (!vendorMap[src]?.[item]) {
+                    throw new Error(`Failed to import ${item} from '${src}' in ${elementPath}/script.ts`);
+                }
+            });
+            return `const ${strObj} = vendor['${src}'];`;
         });
-        return `const ${g1} = vendor['${src}'];`;
     });
-    return result;
 };
 const getScriptClass = (metadata) => {
     if (!metadata?.script) {