feat(sassimportentry): integrate makeimport

Author: kwonoj

src/interop/importer/sassImportEntry.ts

@@ -1,7 +1,14 @@
 import { log } from '../../util/logger';
+import { getFnPtrHandler } from '../fnPtrHandler';
 import { StringMethodInterface } from '../interopUtility';
 import { wrapSassImporter } from './wrapSassImporter';
 
+type importCallbackType = (
+  path: string,
+  importEntry: SassImportEntryInterface,
+  compiler: any
+) => Array<SassImportEntryInterface>;
+
 /**
  * Interop interface to `Sass_Import_Entry`
  *
@@ -42,23 +49,41 @@ class SassImportEntry implements SassImportEntryInterface {
    * Raw pointer to `struct Sass_Import_Entry*`
    * @internal
    */
-  public readonly sassImportEntryPtr: number;
+  public sassImportEntryPtr: number;
+  /**
+   * Hold pointer to function added via `addFunction`, to be removed when disposing entry instance.
+   */
+  private callbackPtr: number;
+
   constructor(
     private readonly cwrapImporter: ReturnType<typeof wrapSassImporter>,
     private readonly strMethod: StringMethodInterface,
-    rel: string,
-    abs: string,
-    source: string,
-    sourceMap: string
-  ) {
+    private readonly fnPtrHandler: ReturnType<typeof getFnPtrHandler>
+  ) {}
+
+  public makeImport(_importCallback: importCallbackType): void {
+    function boo(_path: number, _cb: number, _comp: number) {
+      //noop
+    }
+    this.callbackPtr = this.fnPtrHandler.add(boo);
+    this.sassImportEntryPtr = this.cwrapImporter.make_importer(
+      this.callbackPtr,
+      0,
+      0 /* TODO: need way to pass cookie */
+    );
+
+    log(`SassImportEntry: created new instance`, { sassImportEntryPtr: this.sassImportEntryPtr });
+  }
+
+  public makeImporter(rel: string, abs: string, source: string, sourceMap: string): void {
     //make_import_entry internally just calls make_import
     this.sassImportEntryPtr = this.cwrapImporter.make_import(
       this.strMethod.alloc(rel),
       this.strMethod.alloc(abs),
       this.strMethod.alloc(source),
       this.strMethod.alloc(sourceMap)
     );
-    log(`SassImportEntry: created new instance`, { sassOptionsPtr: this.sassImportEntryPtr });
+    log(`SassImportEntry: created new instance`, { sassImportEntryPtr: this.sassImportEntryPtr });
   }
 
   public get error(): { message: string; line: number; column: number } {
@@ -100,7 +125,8 @@ class SassImportEntry implements SassImportEntryInterface {
 
   public dispose(): void {
     this.cwrapImporter.delete_import(this.sassImportEntryPtr);
+    this.fnPtrHandler.remove(this.callbackPtr);
   }
 }
 
-export { SassImportEntryInterface, SassImportEntry };
+export { SassImportEntryInterface, SassImportEntry, importCallbackType };

src/interop/importer/wrapSassImporter.ts

@@ -8,10 +8,11 @@ import { cwrapSignature } from 'emscripten-wasm-loader';
 //TODO: verify return type / param type of cwrapped signature for Sass_Import_Entry
 const wrapSassImporter = (cwrap: cwrapSignature) => ({
   //Sass_Importer_Entry sass_make_importer (Sass_Importer_Fn importer, double priority, void* cookie);
-  make_importer: cwrap<(importFnPtr: number, cookie: number) => number>(`sass_make_importer`, 'number', [
+  make_importer: cwrap<(importFnPtr: number, priority: number, cookie: number) => number>(
+    `sass_make_importer`,
     'number',
-    'number'
-  ]),
+    ['number', 'number', 'number']
+  ),
   //Sass_C_Import_Fn sass_importer_get_function (Sass_C_Import_Callback fn);
   importer_get_function: cwrap<(importCallbackPtr: number) => number>(`sass_importer_get_function`, 'number', [
     'number'