@hologit/lens-lib-k8s 0.6.0 → 0.6.2

package/index.js

@@ -1,6 +1,85 @@
 const fs = require('fs');
 const yaml = require('js-yaml');
 
+// Create a custom int type that handles both regular ints and octals
+const CustomIntType = new yaml.Type('tag:yaml.org,2002:int', {
+    kind: 'scalar',
+    resolve: function (data) {
+        if (data === null || data === undefined) return false;
+
+        // Check for octal pattern first
+        const octalPattern = /^0[0-7]+$/;
+        if (octalPattern.test(data)) {
+            return true;
+        }
+
+        // Otherwise check for regular int patterns
+        const intPattern = /^[-+]?[0-9]+$/;
+        const hexPattern = /^0x[0-9a-fA-F]+$/;
+        return intPattern.test(data) || hexPattern.test(data);
+    },
+    construct: function (data) {
+        const octalPattern = /^0[0-7]+$/;
+
+        if (octalPattern.test(data)) {
+            // Parse as octal and return a wrapper object
+            const value = parseInt(data, 8);
+            return { __octal: true, value: value, original: data };
+        }
+
+        // Parse as regular int
+        return parseInt(data, 10);
+    },
+    predicate: function (object) {
+        // Explicitly reject null and undefined
+        if (object === null || object === undefined) {
+            return false;
+        }
+        // Check if this is our octal wrapper object or a regular number
+        if (typeof object === 'object' && object.__octal === true) {
+            return true;
+        }
+        return Object.prototype.toString.call(object) === '[object Number]' &&
+               (object % 1 === 0 && !isNaN(object));
+    },
+    represent: function (object) {
+        // If it's an octal wrapper, use the stored format
+        if (object && typeof object === 'object' && object.__octal === true) {
+            return object.original;
+        }
+        // Otherwise represent as decimal
+        return String(object);
+    },
+    defaultStyle: 'decimal'
+});
+
+// Create a custom schema with our custom int type
+// We extend the CORE schema (which has null, bool, etc.) and add our custom int type
+// This ensures null/bool are processed before our int type
+const OCTAL_SCHEMA = yaml.DEFAULT_SCHEMA.extend({
+    implicit: [CustomIntType]
+});
+
+/**
+ * Load YAML content with OCTAL_SCHEMA by default
+ * @param {string} content - YAML content to parse
+ * @param {object} options - Additional options to pass to yaml.loadAll
+ * @returns {array} Array of parsed objects
+ */
+function loadYaml(content, options = {}) {
+    return yaml.loadAll(content, { schema: OCTAL_SCHEMA, ...options });
+}
+
+/**
+ * Dump object to YAML with OCTAL_SCHEMA by default
+ * @param {object} object - Object to serialize
+ * @param {object} options - Additional options to pass to yaml.dump
+ * @returns {string} YAML string
+ */
+function dumpYaml(object, options = {}) {
+    return yaml.dump(object, { schema: OCTAL_SCHEMA, ...options });
+}
+
 // List of kinds that don't support namespaces
 const namespacelessKinds = [
     'apiservices',
@@ -78,7 +157,7 @@ async function patchNamespaces(yamlPath, {
     }
 
     // load objects
-    const objects = yaml.loadAll(fs.readFileSync(yamlPath, 'utf8'));
+    const objects = loadYaml(fs.readFileSync(yamlPath, 'utf8'));
 
     // patch namespaces
     let patchedCount = 0;
@@ -115,7 +194,7 @@ async function patchNamespaces(yamlPath, {
         yamlPath,
         objects
             .filter(obj => obj !== null)
-            .map(object => yaml.dump(object))
+            .map(object => dumpYaml(object))
             .join('\n---\n\n')
     );
     console.error(`patched ${patchedCount} namespaces in ${yamlPath}`);
@@ -127,6 +206,9 @@ module.exports = {
     generateNamespaceManifest,
     patchNamespaces,
 
-    // Export common utilities that might be needed by lenses
-    yaml
+    // Export YAML utilities
+    yaml,
+    OCTAL_SCHEMA,
+    loadYaml,
+    dumpYaml
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hologit/lens-lib-k8s",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Shared kubernetes library for hologit lenses",
   "main": "index.js",
   "scripts": {