@alizarin/napi 0.2.1-alpha.83 → 0.2.1-alpha.85

package/__test__/index.mjs

@@ -4,7 +4,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 
-import { NapiPrebuildLoader, NapiStaticGraph, NapiStaticResourceRegistry, NapiResourceModelWrapper, NapiResourceInstanceWrapper } from '../index.js';
+import { NapiStaticGraph, NapiStaticResourceRegistry, NapiResourceModelWrapper, NapiResourceInstanceWrapper } from '../index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const TEST_DATA = path.resolve(__dirname, '..', '..', '..', 'tests');
@@ -59,15 +59,6 @@ describe('NapiStaticResourceRegistry', () => {
   });
 });
 
-describe('NapiPrebuildLoader', () => {
-  it('throws for nonexistent directory', () => {
-    assert.throws(
-      () => new NapiPrebuildLoader('/nonexistent/path'),
-      /not found/i
-    );
-  });
-});
-
 // =============================================================================
 // NapiResourceModelWrapper
 // =============================================================================

package/index.d.ts

@@ -40,6 +40,17 @@ export declare function extensionResolveMarkers(datatype: string, tileData: any,
 export declare function hasExtensionHandler(datatype: string): boolean
 /** List all registered extension handler datatypes. */
 export declare function getRegisteredExtensionHandlers(): Array<string>
+/**
+ * Import a prebuild/pkg directory: register graphs, load SKOS collections,
+ * and load ontology configs.
+ *
+ * 1. Loads and registers all graphs from graphs/resource_models/ and graphs/branches/
+ * 2. Parses SKOS XML from reference_data/collections/ into the global RDM cache
+ * 3. Loads ontology configs from ontologies/ (if present)
+ *
+ * Returns `{ graphIds, collectionIds, collections, ontologyConfigs }`.
+ */
+export declare function importPrebuild(prebuildDir: string, baseUri: string): any
 export declare class NapiRdmCache {
   constructor()
   /** Load collections from a SKOS JSON string. */
@@ -160,8 +171,12 @@ export declare class NapiResourceInstanceWrapper {
   valuesFromResourceNodegroup(existingValuesJs: any, nodegroupTileIds: Array<string>, nodegroupId: string): NapiValuesFromNodegroupResult
   /** Resolve a dot-separated path and return a PseudoList. */
   getValuesAtPath(path: string): NapiPseudoList
-  /** Get semantic child value for a parent/child relationship. */
-  getSemanticChildValue(parentTileId: string | undefined | null, parentNodeId: string, parentNodegroupId: string | undefined | null, childAlias: string): any
+  /**
+   * Get semantic child value for a parent/child relationship.
+   * Returns a NapiPseudoList (or null for empty). Singles are wrapped in a
+   * single-element list so the JS `wrapRustPseudo` path works uniformly.
+   */
+  getSemanticChildValue(parentTileId: string | undefined | null, parentNodeId: string, parentNodegroupId: string | undefined | null, childAlias: string): NapiPseudoList | null
   /** Get all semantic child values for a parent node. */
   getAllSemanticChildValues(parentTileId: string | undefined | null, parentNodeId: string, parentNodegroupId?: string | undefined | null): any
   /** Find all semantic children of a parent node (returns map of alias → tile IDs). */
@@ -247,24 +262,6 @@ export declare class NapiResourceModelWrapper {
   /** Prune graph to only include permitted nodegroups and their dependencies. */
   pruneGraph(keepFunctions?: Array<string> | undefined | null): void
 }
-export declare class NapiPrebuildLoader {
-  constructor(path: string)
-  /** Load a single graph from a JSON file path (relative to prebuild root or absolute). */
-  loadGraph(path: string): NapiStaticGraph
-  /** Load all graphs from prebuild/graphs/resource_models/ */
-  loadAllGraphs(): Array<NapiStaticGraph>
-  /**
-   * Load full resources (with tiles) from a single business data file,
-   * filtered by graph ID.
-   */
-  loadFullResourcesFromFile(path: string, graphId: string): any
-  /** Find all business data JSON files in the prebuild directory. */
-  findBusinessDataFiles(): Array<string>
-  /** Get prebuild directory info. */
-  getInfo(): any
-  /** Count resources for a given graph ID. */
-  countResourcesForGraph(graphId: string): number
-}
 export declare class NapiPrebuildExporter {
   constructor()
   /**

package/index.js

@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { NapiRdmCache, NapiNodeConfigManager, NapiPseudoValue, NapiPseudoList, NapiPopulateResult, NapiEnsureNodegroupResult, NapiValuesFromNodegroupResult, NapiResourceInstanceWrapper, NapiResourceModelWrapper, NapiPrebuildLoader, NapiPrebuildExporter, NapiStaticGraph, NapiStaticResourceRegistry, buildGraphFromCsvs, buildBusinessDataFromCsv, extensionCoerce, extensionRenderDisplay, extensionResolveMarkers, hasExtensionHandler, getRegisteredExtensionHandlers } = nativeBinding
+const { NapiRdmCache, NapiNodeConfigManager, NapiPseudoValue, NapiPseudoList, NapiPopulateResult, NapiEnsureNodegroupResult, NapiValuesFromNodegroupResult, NapiResourceInstanceWrapper, NapiResourceModelWrapper, NapiPrebuildExporter, NapiStaticGraph, NapiStaticResourceRegistry, buildGraphFromCsvs, buildBusinessDataFromCsv, extensionCoerce, extensionRenderDisplay, extensionResolveMarkers, hasExtensionHandler, getRegisteredExtensionHandlers, importPrebuild } = nativeBinding
 
 module.exports.NapiRdmCache = NapiRdmCache
 module.exports.NapiNodeConfigManager = NapiNodeConfigManager
@@ -321,7 +321,6 @@ module.exports.NapiEnsureNodegroupResult = NapiEnsureNodegroupResult
 module.exports.NapiValuesFromNodegroupResult = NapiValuesFromNodegroupResult
 module.exports.NapiResourceInstanceWrapper = NapiResourceInstanceWrapper
 module.exports.NapiResourceModelWrapper = NapiResourceModelWrapper
-module.exports.NapiPrebuildLoader = NapiPrebuildLoader
 module.exports.NapiPrebuildExporter = NapiPrebuildExporter
 module.exports.NapiStaticGraph = NapiStaticGraph
 module.exports.NapiStaticResourceRegistry = NapiStaticResourceRegistry
@@ -332,3 +331,4 @@ module.exports.extensionRenderDisplay = extensionRenderDisplay
 module.exports.extensionResolveMarkers = extensionResolveMarkers
 module.exports.hasExtensionHandler = hasExtensionHandler
 module.exports.getRegisteredExtensionHandlers = getRegisteredExtensionHandlers
+module.exports.importPrebuild = importPrebuild

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@alizarin/napi",
-  "version": "0.2.1-alpha.83",
+  "version": "0.2.1-alpha.85",
   "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/flaxandteal/alizarin",
+    "directory": "crates/alizarin-napi"
+  },
   "main": "index.js",
   "types": "index.d.ts",
   "bin": {
@@ -25,8 +30,8 @@
     "@napi-rs/cli": "^2.18.0"
   },
   "optionalDependencies": {
-    "@alizarin/napi-win32-x64-msvc": "0.2.1-alpha.83",
-    "@alizarin/napi-darwin-x64": "0.2.1-alpha.83",
-    "@alizarin/napi-linux-x64-gnu": "0.2.1-alpha.83"
+    "@alizarin/napi-win32-x64-msvc": "0.2.1-alpha.85",
+    "@alizarin/napi-darwin-x64": "0.2.1-alpha.85",
+    "@alizarin/napi-linux-x64-gnu": "0.2.1-alpha.85"
   }
 }

package/src/instance_wrapper_napi.rs

@@ -906,6 +906,8 @@ impl NapiResourceInstanceWrapper {
     // =========================================================================
 
     /// Get semantic child value for a parent/child relationship.
+    /// Returns a NapiPseudoList (or null for empty). Singles are wrapped in a
+    /// single-element list so the JS `wrapRustPseudo` path works uniformly.
     #[napi]
     pub fn get_semantic_child_value(
         &self,
@@ -913,7 +915,7 @@ impl NapiResourceInstanceWrapper {
         parent_node_id: String,
         parent_nodegroup_id: Option<String>,
         child_alias: String,
-    ) -> Result<serde_json::Value> {
+    ) -> Result<Option<NapiPseudoList>> {
         let result = self
             .inner
             .get_semantic_child_value(
@@ -926,15 +928,18 @@ impl NapiResourceInstanceWrapper {
             .map_err(sc_err)?;
 
         match result {
-            SemanticChildResult::List(list) => {
-                Ok(serde_json::to_value(NapiPseudoListJson::from(&list))
-                    .unwrap_or(serde_json::Value::Null))
-            }
+            SemanticChildResult::List(list) => Ok(Some(NapiPseudoList { inner: list })),
             SemanticChildResult::Single(val) => {
-                Ok(serde_json::to_value(NapiPseudoValueJson::from(&val))
-                    .unwrap_or(serde_json::Value::Null))
+                // Wrap single value in a PseudoListCore so JS sees a uniform interface
+                let list = alizarin_core::PseudoListCore {
+                    node_alias: val.node.alias.clone().unwrap_or_default(),
+                    is_single: true,
+                    is_loaded: true,
+                    values: vec![val],
+                };
+                Ok(Some(NapiPseudoList { inner: list }))
             }
-            SemanticChildResult::Empty => Ok(serde_json::Value::Null),
+            SemanticChildResult::Empty => Ok(None),
         }
     }
 

package/src/lib.rs

@@ -12,7 +12,7 @@ use alizarin_core::skos::SkosCollection;
 use alizarin_core::type_serialization::SerializationContext;
 use alizarin_core::{
     build_graph_from_model_csvs, build_resources_from_business_csv, wrap_business_data,
-    PrebuildLoader, StaticGraph, StaticResource, StaticResourceRegistry,
+    StaticGraph, StaticResource, StaticResourceRegistry,
 };
 
 // ============================================================================
@@ -43,87 +43,6 @@ fn loader_err(e: alizarin_core::LoaderError) -> napi::Error {
     napi::Error::from_reason(e.to_string())
 }
 
-// ============================================================================
-// NapiPrebuildLoader
-// ============================================================================
-
-#[napi]
-pub struct NapiPrebuildLoader {
-    inner: PrebuildLoader,
-}
-
-#[napi]
-impl NapiPrebuildLoader {
-    #[napi(constructor)]
-    pub fn new(path: String) -> Result<Self> {
-        let inner = PrebuildLoader::new(&path).map_err(loader_err)?;
-        Ok(NapiPrebuildLoader { inner })
-    }
-
-    /// Load a single graph from a JSON file path (relative to prebuild root or absolute).
-    #[napi]
-    pub fn load_graph(&self, path: String) -> Result<NapiStaticGraph> {
-        let graph = self.inner.load_graph(&path).map_err(loader_err)?;
-        Ok(NapiStaticGraph { inner: graph })
-    }
-
-    /// Load all graphs from prebuild/graphs/resource_models/
-    #[napi]
-    pub fn load_all_graphs(&self) -> Result<Vec<NapiStaticGraph>> {
-        let graphs = self.inner.load_all_graphs().map_err(loader_err)?;
-        Ok(graphs
-            .into_iter()
-            .map(|g| NapiStaticGraph { inner: g })
-            .collect())
-    }
-
-    /// Load full resources (with tiles) from a single business data file,
-    /// filtered by graph ID.
-    #[napi]
-    pub fn load_full_resources_from_file(
-        &self,
-        path: String,
-        graph_id: String,
-    ) -> Result<serde_json::Value> {
-        let resources = self
-            .inner
-            .load_full_resources_from_file(std::path::Path::new(&path), &graph_id)
-            .map_err(loader_err)?;
-        serde_json::to_value(&resources).map_err(|e| napi::Error::from_reason(e.to_string()))
-    }
-
-    /// Find all business data JSON files in the prebuild directory.
-    #[napi]
-    pub fn find_business_data_files(&self) -> Result<Vec<String>> {
-        let files = self.inner.find_business_data_files().map_err(loader_err)?;
-        Ok(files.into_iter().map(|p| p.display().to_string()).collect())
-    }
-
-    /// Get prebuild directory info.
-    #[napi]
-    pub fn get_info(&self) -> Result<serde_json::Value> {
-        let info = self.inner.get_info().map_err(loader_err)?;
-        Ok(serde_json::json!({
-            "path": info.path.display().to_string(),
-            "hasGraphs": info.has_graphs,
-            "hasBusinessData": info.has_business_data,
-            "hasReferenceData": info.has_reference_data,
-            "hasIndexTemplates": info.has_index_templates,
-            "graphFiles": info.graph_files.iter().map(|p| p.display().to_string()).collect::<Vec<_>>(),
-        }))
-    }
-
-    /// Count resources for a given graph ID.
-    #[napi]
-    pub fn count_resources_for_graph(&self, graph_id: String) -> Result<u32> {
-        let count = self
-            .inner
-            .count_resources_for_graph(&graph_id)
-            .map_err(loader_err)?;
-        Ok(count as u32)
-    }
-}
-
 // ============================================================================
 // NapiPrebuildExporter
 // ============================================================================
@@ -609,3 +528,35 @@ pub fn get_registered_extension_handlers() -> Vec<String> {
         .map(|s| s.to_string())
         .collect()
 }
+
+// ============================================================================
+// Prebuild import (high-level convenience)
+// ============================================================================
+
+/// Import a prebuild/pkg directory: register graphs, load SKOS collections,
+/// and load ontology configs.
+///
+/// 1. Loads and registers all graphs from graphs/resource_models/ and graphs/branches/
+/// 2. Parses SKOS XML from reference_data/collections/ into the global RDM cache
+/// 3. Loads ontology configs from ontologies/ (if present)
+///
+/// Returns `{ graphIds, collectionIds, collections, ontologyConfigs }`.
+#[napi(js_name = "importPrebuild")]
+pub fn import_prebuild(prebuild_dir: String, base_uri: String) -> Result<serde_json::Value> {
+    let result = alizarin_core::import_prebuild(&prebuild_dir, &base_uri).map_err(loader_err)?;
+
+    let collections_json = serde_json::to_value(&result.collections)
+        .map_err(|e| napi::Error::from_reason(e.to_string()))?;
+    let ontology_configs: Vec<serde_json::Value> = result
+        .ontology_configs
+        .iter()
+        .filter_map(|c| serde_json::to_value(c).ok())
+        .collect();
+
+    Ok(serde_json::json!({
+        "graphIds": result.graph_ids,
+        "collectionIds": result.collection_ids,
+        "collections": collections_json,
+        "ontologyConfigs": ontology_configs,
+    }))
+}