@aircast-4g/mavlink 1.1.3 → 1.1.5

package/package.json

@@ -1,26 +1,52 @@
 {
   "name": "@aircast-4g/mavlink",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "TypeScript type generator for MAVLink dialects",
-  "main": "dist/index.js",
+  "main": "dist/mavlink.cjs.js",
+  "module": "dist/mavlink.esm.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "require": "./dist/index.js",
-      "import": "./dist/index.js"
+      "browser": "./dist/mavlink.esm.js",
+      "import": "./dist/mavlink.esm.js",
+      "require": "./dist/mavlink.cjs.js"
     },
+    "./iife": "./dist/mavlink.iife.js",
     "./dialects/common": {
-      "types": "./dist/dialects/common/index.d.ts"
+      "types": "./dist/dialects/common/index.d.ts",
+      "import": "./dist/dialects/common/index.js",
+      "require": "./dist/dialects/common/index.js"
     },
     "./dialects/minimal": {
-      "types": "./dist/dialects/minimal/index.d.ts"
+      "types": "./dist/dialects/minimal/index.d.ts",
+      "import": "./dist/dialects/minimal/index.js",
+      "require": "./dist/dialects/minimal/index.js"
     },
     "./dialects/ardupilotmega": {
-      "types": "./dist/dialects/ardupilotmega/index.d.ts"
+      "types": "./dist/dialects/ardupilotmega/index.d.ts",
+      "import": "./dist/dialects/ardupilotmega/index.js",
+      "require": "./dist/dialects/ardupilotmega/index.js"
     },
     "./dialects/standard": {
-      "types": "./dist/dialects/standard/index.d.ts"
+      "types": "./dist/dialects/standard/index.d.ts",
+      "import": "./dist/dialects/standard/index.js",
+      "require": "./dist/dialects/standard/index.js"
+    },
+    "./dialects/test": {
+      "types": "./dist/dialects/test/index.d.ts",
+      "import": "./dist/dialects/test/index.js",
+      "require": "./dist/dialects/test/index.js"
+    },
+    "./dialects/paparazzi": {
+      "types": "./dist/dialects/paparazzi/index.d.ts",
+      "import": "./dist/dialects/paparazzi/index.js",
+      "require": "./dist/dialects/paparazzi/index.js"
+    },
+    "./dialects/python_array_test": {
+      "types": "./dist/dialects/python_array_test/index.d.ts",
+      "import": "./dist/dialects/python_array_test/index.js",
+      "require": "./dist/dialects/python_array_test/index.js"
     }
   },
   "bin": {
@@ -32,19 +58,21 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "tsc && npm run gen:common && npm run gen:ardupilotmega && npm run gen:minimal",
+    "build": "npm run clean && npm run generate && npm run build:bundle",
+    "build:bundle": "rollup -c",
+    "generate": "npm run gen:all",
     "start": "node dist/cli.js",
     "dev": "tsx src/cli.ts",
     "test": "jest",
     "lint": "eslint src/**/*.ts",
-    "clean": "rm -rf dist",
-    "gen:common": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/common.xml -o ./dist/dialects/common",
-    "gen:ardupilotmega": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/ardupilotmega.xml -o ./dist/dialects/ardupilotmega",
-    "gen:minimal": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/minimal.xml -o ./dist/dialects/minimal",
-    "gen:test": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/test.xml -o ./dist/dialects/test",
-    "gen:paparazzi": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/paparazzi.xml -o ./dist/dialects/paparazzi",
-    "gen:python_array_test": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/python_array_test.xml -o ./dist/dialects/python_array_test",
-    "gen:standard": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/standard.xml -o ./dist/dialects/standard",
+    "clean": "rm -rf dist src/generated",
+    "gen:common": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/common.xml -o ./src/generated/dialects/common",
+    "gen:ardupilotmega": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/ardupilotmega.xml -o ./src/generated/dialects/ardupilotmega",
+    "gen:minimal": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/minimal.xml -o ./src/generated/dialects/minimal",
+    "gen:test": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/test.xml -o ./src/generated/dialects/test",
+    "gen:paparazzi": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/paparazzi.xml -o ./src/generated/dialects/paparazzi",
+    "gen:python_array_test": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/python_array_test.xml -o ./src/generated/dialects/python_array_test",
+    "gen:standard": "tsx src/cli.ts generate -i https://raw.githubusercontent.com/mavlink/mavlink/master/message_definitions/v1.0/standard.xml -o ./src/generated/dialects/standard",
     "gen:all": "npm run gen:common && npm run gen:ardupilotmega && npm run gen:minimal && npm run gen:test && npm run gen:paparazzi && npm run gen:python_array_test && npm run gen:standard",
     "release:patch": "npm version patch && git push origin master --tags && gh release create v$(node -p \"require('./package.json').version\") --title \"v$(node -p \"require('./package.json').version\")\" --generate-notes",
     "release:minor": "npm version minor && git push origin master --tags && gh release create v$(node -p \"require('./package.json').version\") --title \"v$(node -p \"require('./package.json').version\")\" --generate-notes",
@@ -78,15 +106,21 @@
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "glob": "^10.3.10",
     "@types/jest": "^30.0.0",
-    "@types/node": "^20.10.0",
+    "@types/node": "^20.19.7",
     "@types/node-fetch": "^2.6.11",
     "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.55.0",
     "jest": "^29.7.0",
+    "rollup": "^4.9.6",
+    "rollup-plugin-dts": "^6.1.0",
     "ts-jest": "^29.4.0",
+    "tslib": "^2.6.2",
     "tsx": "^4.6.0",
     "typescript": "^5.3.0"
   },

package/dist/cli.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}

package/dist/cli.js

@@ -1,174 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const generator_1 = require("./generator/generator");
-const batch_processor_1 = require("./generator/batch-processor");
-const fs_1 = require("fs");
-const program = new commander_1.Command();
-program
-    .name('aircast-mavlink')
-    .description('Aircast MAVLink TypeScript type generator')
-    .version('1.0.0');
-program
-    .command('generate')
-    .description('Generate TypeScript types from a MAVLink XML dialect')
-    .option('-i, --input <path>', 'Input XML file path or URL')
-    .option('-o, --output <path>', 'Output directory path', './types')
-    .option('-n, --name <name>', 'Dialect name (auto-detected if not provided)')
-    .option('-f, --format <format>', 'Output format: single or separate', 'separate')
-    .option('--no-enums', 'Skip enum generation')
-    .option('--no-type-guards', 'Skip type guard generation')
-    .action(async (options) => {
-    try {
-        if (!options.input) {
-            console.error('Error: Input file or URL is required');
-            process.exit(1);
-        }
-        const generator = new generator_1.MAVLinkGenerator();
-        const dialectName = options.name || extractDialectName(options.input);
-        const generationOptions = {
-            dialectName,
-            outputFormat: options.format,
-            includeEnums: options.enums !== false,
-            includeTypeGuards: options.typeGuards !== false
-        };
-        console.log(`Generating TypeScript types for ${dialectName}...`);
-        console.log(`Input: ${options.input}`);
-        console.log(`Output: ${options.output}`);
-        console.log(`Format: ${generationOptions.outputFormat}`);
-        if (options.input.startsWith('http')) {
-            await generator.generateFromURL(options.input, options.output, generationOptions);
-        }
-        else {
-            if (!(0, fs_1.existsSync)(options.input)) {
-                console.error(`Error: Input file does not exist: ${options.input}`);
-                process.exit(1);
-            }
-            await generator.generateFromFile(options.input, options.output, generationOptions);
-        }
-        console.log('✅ Generation completed successfully!');
-    }
-    catch (error) {
-        console.error('❌ Generation failed:', error);
-        process.exit(1);
-    }
-});
-program
-    .command('batch')
-    .description('Generate TypeScript types for multiple MAVLink dialects')
-    .option('-o, --output <path>', 'Output directory path', './mavlink-types')
-    .option('-d, --dialects <dialects>', 'Comma-separated list of dialect names (generates all if not specified)')
-    .option('-f, --format <format>', 'Output format: single or separate', 'separate')
-    .option('--no-enums', 'Skip enum generation')
-    .option('--no-type-guards', 'Skip type guard generation')
-    .option('--package', 'Generate package.json and tsconfig.json')
-    .action(async (options) => {
-    try {
-        const processor = new batch_processor_1.BatchProcessor();
-        const processorOptions = {
-            outputDir: options.output,
-            dialectFormat: options.format,
-            includeEnums: options.enums !== false,
-            includeTypeGuards: options.typeGuards !== false
-        };
-        console.log(`Generating TypeScript types for MAVLink dialects...`);
-        console.log(`Output directory: ${options.output}`);
-        console.log(`Format: ${processorOptions.dialectFormat}`);
-        if (options.dialects) {
-            const dialectNames = options.dialects.split(',').map((name) => name.trim());
-            console.log(`Processing specific dialects: ${dialectNames.join(', ')}`);
-            await processor.processSpecificDialects(dialectNames, processorOptions);
-        }
-        else {
-            console.log('Processing all available dialects...');
-            await processor.processAllDialects(processorOptions);
-        }
-        if (options.package) {
-            await processor.generatePackageJson(options.output);
-        }
-        console.log('✅ Batch generation completed successfully!');
-    }
-    catch (error) {
-        console.error('❌ Batch generation failed:', error);
-        process.exit(1);
-    }
-});
-program
-    .command('list')
-    .description('List available MAVLink dialects')
-    .action(async () => {
-    try {
-        console.log('Fetching available MAVLink dialects...');
-        const fetch = (await Promise.resolve().then(() => __importStar(require('node-fetch')))).default;
-        const response = await fetch('https://api.github.com/repos/mavlink/mavlink/contents/message_definitions/v1.0');
-        if (!response.ok) {
-            throw new Error(`Failed to fetch dialects: ${response.statusText}`);
-        }
-        const files = await response.json();
-        const dialects = files
-            .filter(file => file.name.endsWith('.xml'))
-            .map(file => file.name.replace('.xml', ''))
-            .sort();
-        console.log('\nAvailable MAVLink dialects:');
-        console.log('==========================');
-        dialects.forEach(dialect => {
-            console.log(`  ${dialect}`);
-        });
-        console.log(`\nTotal: ${dialects.length} dialects`);
-    }
-    catch (error) {
-        console.error('❌ Failed to fetch dialects list:', error);
-        process.exit(1);
-    }
-});
-function extractDialectName(input) {
-    // Extract dialect name from file path or URL
-    const parts = input.split('/');
-    const filename = parts[parts.length - 1];
-    return filename.replace('.xml', '').toLowerCase().replace('_', '');
-}
-// Handle uncaught errors
-process.on('unhandledRejection', (reason, promise) => {
-    console.error('Unhandled Rejection at:', promise, 'reason:', reason);
-    process.exit(1);
-});
-process.on('uncaughtException', (error) => {
-    console.error('Uncaught Exception:', error);
-    process.exit(1);
-});
-program.parse();
-//# sourceMappingURL=cli.js.map

package/dist/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}