@navita/core 0.0.12 → 0.1.0

package/createRenderer.cjs

@@ -4,14 +4,21 @@ var engine = require('@navita/engine');
 var MagicString = require('magic-string');
 var evaluateAndProcess = require('./evaluateAndProcess.cjs');
 
+const resultCache = {};
 function createRenderer({ resolver , readFile , importMap =[] , engineOptions , context  }) {
     const engine$1 = new engine.Engine({
         context,
         ...engineOptions || {}
     });
+    const clearCache = (filePath)=>{
+        engine$1.clearCache(filePath);
+        resultCache[filePath] = [];
+    };
     return {
         engine: engine$1,
+        clearCache,
         async transformAndProcess ({ content , filePath  }) {
+            clearCache(filePath);
             const { result , dependencies  } = await evaluateAndProcess.evaluateAndProcess({
                 type: 'entryPoint',
                 source: content,
@@ -19,7 +26,8 @@ function createRenderer({ resolver , readFile , importMap =[] , engineOptions ,
                 resolver,
                 readFile,
                 importMap,
-                engine: engine$1
+                engine: engine$1,
+                resultCache
             });
             const newSource = new MagicString(content, {
                 filename: filePath

package/createRenderer.d.ts

@@ -13,6 +13,7 @@ interface Options {
 }
 declare function createRenderer({ resolver, readFile, importMap, engineOptions, context, }: Options): {
     engine: Engine;
+    clearCache: (filePath: string) => void;
     transformAndProcess({ content, filePath, }: {
         content: string;
         filePath: string;

package/createRenderer.mjs

@@ -2,14 +2,21 @@ import { Engine } from '@navita/engine';
 import MagicString from 'magic-string';
 import { evaluateAndProcess } from './evaluateAndProcess.mjs';
 
+const resultCache = {};
 function createRenderer({ resolver , readFile , importMap =[] , engineOptions , context  }) {
     const engine = new Engine({
         context,
         ...engineOptions || {}
     });
+    const clearCache = (filePath)=>{
+        engine.clearCache(filePath);
+        resultCache[filePath] = [];
+    };
     return {
         engine,
+        clearCache,
         async transformAndProcess ({ content , filePath  }) {
+            clearCache(filePath);
             const { result , dependencies  } = await evaluateAndProcess({
                 type: 'entryPoint',
                 source: content,
@@ -17,7 +24,8 @@ function createRenderer({ resolver , readFile , importMap =[] , engineOptions ,
                 resolver,
                 readFile,
                 importMap,
-                engine
+                engine,
+                resultCache
             });
             const newSource = new MagicString(content, {
                 filename: filePath

package/evaluateAndProcess.cjs

@@ -11,8 +11,8 @@ const isExternal = (dependency)=>dependency.startsWith(rootDir) || dependency.in
 const defaultNodeModuleCache = {};
 const defaultResolverCache = {};
 const defaultModuleCache = new Map();
-const collectedResults = {};
-async function evaluateAndProcess({ type , filePath , source , engine , resolver , readFile , importMap , nodeModuleCache =defaultNodeModuleCache , resolverCache =defaultResolverCache , moduleCache =defaultModuleCache  }) {
+const defaultResultCache = {};
+async function evaluateAndProcess({ type , filePath , source , engine , resolver , readFile , importMap , nodeModuleCache =defaultNodeModuleCache , resolverCache =defaultResolverCache , moduleCache =defaultModuleCache , resultCache =defaultResultCache  }) {
     const cacheKey = `${filePath}:${type}`;
     const compiledFn = await (async ()=>{
         if (moduleCache.has(cacheKey)) {
@@ -34,7 +34,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
             nodeModuleCache,
             setAdapter: ()=>helpers_setAdapter.setAdapter({
                     engine,
-                    collectResults: collectedResults
+                    resultCache: resultCache
                 })
         }, (dependency)=>readFile(dependency).then((source)=>evaluateAndProcess({
                     type: 'dependency',
@@ -58,7 +58,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
     return compiledFn().then(({ dependencies , exports  })=>{
         if (type === 'entryPoint') {
             return {
-                result: collectedResults[filePath] || [],
+                result: resultCache[filePath] || [],
                 dependencies
             };
         }

package/evaluateAndProcess.d.ts

@@ -6,7 +6,7 @@ type ResolverCache = Record<FilePath$1, unknown>;
 type NodeModuleCache = Record<FilePath$1, unknown>;
 
 type FilePath = string;
-type CollectedResults = Record<FilePath, {
+type ResultCache = Record<FilePath, {
     start: number;
     end: number;
     value: string;
@@ -24,13 +24,14 @@ interface Caches {
     nodeModuleCache?: NodeModuleCache;
     resolverCache?: ResolverCache;
     moduleCache?: ModuleCache;
+    resultCache?: ResultCache;
 }
 type Types = 'entryPoint' | 'dependency';
 interface Output<Type extends Types> {
-    result: Type extends 'entryPoint' ? CollectedResults[number] : Record<string, unknown>;
+    result: Type extends 'entryPoint' ? ResultCache[number] : Record<string, unknown>;
     dependencies: string[];
 }
-declare function evaluateAndProcess<Type extends 'entryPoint' | 'dependency'>({ type, filePath, source, engine, resolver, readFile, importMap, nodeModuleCache, resolverCache, moduleCache, }: {
+declare function evaluateAndProcess<Type extends 'entryPoint' | 'dependency'>({ type, filePath, source, engine, resolver, readFile, importMap, nodeModuleCache, resolverCache, moduleCache, resultCache, }: {
     source: string;
     filePath: string;
     type: Type;

package/evaluateAndProcess.mjs

@@ -13,8 +13,8 @@ const isExternal = (dependency)=>dependency.startsWith(rootDir) || dependency.in
 const defaultNodeModuleCache = {};
 const defaultResolverCache = {};
 const defaultModuleCache = new Map();
-const collectedResults = {};
-async function evaluateAndProcess({ type , filePath , source , engine , resolver , readFile , importMap , nodeModuleCache =defaultNodeModuleCache , resolverCache =defaultResolverCache , moduleCache =defaultModuleCache  }) {
+const defaultResultCache = {};
+async function evaluateAndProcess({ type , filePath , source , engine , resolver , readFile , importMap , nodeModuleCache =defaultNodeModuleCache , resolverCache =defaultResolverCache , moduleCache =defaultModuleCache , resultCache =defaultResultCache  }) {
     const cacheKey = `${filePath}:${type}`;
     const compiledFn = await (async ()=>{
         if (moduleCache.has(cacheKey)) {
@@ -36,7 +36,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
             nodeModuleCache,
             setAdapter: ()=>setAdapter({
                     engine,
-                    collectResults: collectedResults
+                    resultCache: resultCache
                 })
         }, (dependency)=>readFile(dependency).then((source)=>evaluateAndProcess({
                     type: 'dependency',
@@ -60,7 +60,7 @@ async function evaluateAndProcess({ type , filePath , source , engine , resolver
     return compiledFn().then(({ dependencies , exports  })=>{
         if (type === 'entryPoint') {
             return {
-                result: collectedResults[filePath] || [],
+                result: resultCache[filePath] || [],
                 dependencies
             };
         }

package/helpers/setAdapter.cjs

@@ -3,7 +3,7 @@
 var adapter = require('@navita/adapter');
 var engine = require('@navita/engine');
 
-function setAdapter({ engine: engine$1 , collectResults ,  }) {
+function setAdapter({ engine: engine$1 , resultCache ,  }) {
     adapter.setAdapter({
         generateIdentifier: (value)=>engine$1.generateIdentifier(value),
         addStaticCss: (selector, css)=>engine$1.addStatic(selector, css),
@@ -19,12 +19,6 @@ function setAdapter({ engine: engine$1 , collectResults ,  }) {
             return engine$1.addFontFace(fontFace);
         },
         collectResult ({ index , filePath , identifier , result: resultFactory , sourceMap: { line , column  } , position ,  }) {
-            if (index === 0) {
-                if (collectResults) {
-                    collectResults[filePath] = [];
-                }
-                engine$1.clearUsedIds(filePath);
-            }
             engine$1.setFilePath(filePath);
             let result = resultFactory();
             engine$1.setFilePath(undefined);
@@ -44,9 +38,12 @@ function setAdapter({ engine: engine$1 , collectResults ,  }) {
                     ].join(' '));
                 }
             }
-            if (collectResults) {
+            if (resultCache) {
+                if (!resultCache[filePath]) {
+                    resultCache[filePath] = [];
+                }
                 const [start, end] = position;
-                collectResults[filePath][index] = {
+                resultCache[filePath][index] = {
                     start,
                     end,
                     value: result === undefined ? "undefined" : JSON.stringify(result)

package/helpers/setAdapter.mjs

@@ -1,7 +1,7 @@
 import { setAdapter as setAdapter$1 } from '@navita/adapter';
 import { ClassList } from '@navita/engine';
 
-function setAdapter({ engine , collectResults ,  }) {
+function setAdapter({ engine , resultCache ,  }) {
     setAdapter$1({
         generateIdentifier: (value)=>engine.generateIdentifier(value),
         addStaticCss: (selector, css)=>engine.addStatic(selector, css),
@@ -17,12 +17,6 @@ function setAdapter({ engine , collectResults ,  }) {
             return engine.addFontFace(fontFace);
         },
         collectResult ({ index , filePath , identifier , result: resultFactory , sourceMap: { line , column  } , position ,  }) {
-            if (index === 0) {
-                if (collectResults) {
-                    collectResults[filePath] = [];
-                }
-                engine.clearUsedIds(filePath);
-            }
             engine.setFilePath(filePath);
             let result = resultFactory();
             engine.setFilePath(undefined);
@@ -42,9 +36,12 @@ function setAdapter({ engine , collectResults ,  }) {
                     ].join(' '));
                 }
             }
-            if (collectResults) {
+            if (resultCache) {
+                if (!resultCache[filePath]) {
+                    resultCache[filePath] = [];
+                }
                 const [start, end] = position;
-                collectResults[filePath][index] = {
+                resultCache[filePath][index] = {
                     start,
                     end,
                     value: result === undefined ? "undefined" : JSON.stringify(result)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navita/core",
-  "version": "0.0.12",
+  "version": "0.1.0",
   "description": "Core package for Navita. Used for creating integrations.",
   "keywords": [
     "core",
@@ -28,10 +28,10 @@
     "enhanced-resolve": "^5.15.0",
     "outdent": "^0.8.0",
     "magic-string": "^0.30.3",
-    "@navita/types": "0.0.10",
-    "@navita/adapter": "0.0.11",
-    "@navita/swc": "0.0.11",
-    "@navita/engine": "0.0.12"
+    "@navita/types": "0.1.0",
+    "@navita/adapter": "0.1.0",
+    "@navita/swc": "0.1.0",
+    "@navita/engine": "0.1.0"
   },
   "license": "MIT",
   "author": "Eagerpatch",