diff --git a/bin/pos-cli-fetch-logs.js b/bin/pos-cli-fetch-logs.js index a0e33dd07..dbd23ddbe 100755 --- a/bin/pos-cli-fetch-logs.js +++ b/bin/pos-cli-fetch-logs.js @@ -1,9 +1,8 @@ #!/usr/bin/env node -const { program } = require('commander'); -const Gateway = require('../lib/proxy'); -const fetchSettings = require('../lib/settings').fetchSettings; -const logger = require('../lib/logger'); +import { program } from 'commander'; +import Gateway from '../lib/proxy.js'; +import { fetchSettings } from '../lib/settings.js'; program .name('pos-cli fetch-logs') @@ -13,7 +12,7 @@ program .option('-q, --quiet', 'suppress non-log output') .action(async (environment, options) => { try { - const authData = fetchSettings(environment); + const authData = await fetchSettings(environment); if (!authData) { console.error('No auth data available. Set environment or MPKIT_* env vars.'); process.exit(2); diff --git a/gui/admin/dist/dupa.png b/gui/admin/dist/dupa.png deleted file mode 100644 index 3484ca3a5..000000000 Binary files a/gui/admin/dist/dupa.png and /dev/null differ diff --git a/gui/admin/static/dupa.png b/gui/admin/static/dupa.png deleted file mode 100644 index 3484ca3a5..000000000 Binary files a/gui/admin/static/dupa.png and /dev/null differ diff --git a/lib/initilizeEsmModules.js b/lib/initilizeEsmModules.js deleted file mode 100644 index 7be35b6b6..000000000 --- a/lib/initilizeEsmModules.js +++ /dev/null @@ -1,2 +0,0 @@ -module.exports = { -}; diff --git a/mcp-min/__tests__/json-to-csv.test.js b/mcp-min/__tests__/json-to-csv.test.js index 1942ca693..ff10f45b6 100644 --- a/mcp-min/__tests__/json-to-csv.test.js +++ b/mcp-min/__tests__/json-to-csv.test.js @@ -1,11 +1,8 @@ import { vi, describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } from 'vitest'; import { jsonToZipBuffer } from '../data/json-to-csv.js'; -import { createRequire } from 'module'; +import unzipper from 'unzipper'; import { Readable } from 'stream'; -const require = createRequire(import.meta.url); -const unzipper = require('unzipper'); - async function extractZipEntries(buffer) { const entries = {}; const directory = await unzipper.Open.buffer(buffer); diff --git a/mcp-min/__tests__/tools.test.js b/mcp-min/__tests__/tools.test.js index 0da7d9352..b087ecf63 100644 --- a/mcp-min/__tests__/tools.test.js +++ b/mcp-min/__tests__/tools.test.js @@ -1,17 +1,10 @@ +import os from 'os'; +import path from 'path'; +import fs from 'fs'; +import { vi, describe, test, expect, beforeEach, afterEach } from 'vitest'; +import singleFileModule, { computeRemotePath, normalizeLocalPath, toPosix } from '../sync/single-file.js'; -const os = require('os'); -const path = require('path'); -const fs = require('fs'); -const { pathToFileURL } = require('url'); -let singleFile; -let singleFileTool; -let computeRemotePath, normalizeLocalPath, toPosix; -beforeAll(async () => { - const mod = await import(pathToFileURL(path.resolve(process.cwd(), 'mcp-min', 'sync', 'single-file.js')).href); - singleFile = mod; - singleFileTool = mod.default; - ({ computeRemotePath, normalizeLocalPath, toPosix } = mod); -}); +const singleFileTool = singleFileModule; // Basic unit tests for helper functions and dry-run behavior diff --git a/mcp-min/data/validate-schemas.js b/mcp-min/data/validate-schemas.js index 0e93e0539..ecb928680 100644 --- a/mcp-min/data/validate-schemas.js +++ b/mcp-min/data/validate-schemas.js @@ -1,10 +1,8 @@ // Schema loading utility for platformOS data validation // Loads schema files from app/schema/ or app/model_schemas/ -import { createRequire } from 'module'; -const require = createRequire(import.meta.url); -const fs = require('fs'); -const path = require('path'); +import fs from 'fs'; +import path from 'path'; /** * Simple YAML parser for platformOS schema format diff --git a/mcp-min/data/validate-tool.js b/mcp-min/data/validate-tool.js index e51be7e2b..69d34408b 100644 --- a/mcp-min/data/validate-tool.js +++ b/mcp-min/data/validate-tool.js @@ -1,12 +1,9 @@ // platformos.data.validate - Validate JSON data against platformOS schemas -import { createRequire } from 'module'; +import fs from 'fs'; +import path from 'path'; import { validateRecords, validateJsonStructure } from './validate.js'; import log from '../log.js'; -const require = createRequire(import.meta.url); -const fs = require('fs'); -const path = require('path'); - const dataValidateTool = { description: 'Validate JSON data against platformOS schemas before import. Checks required fields (id, type, properties, created_at, updated_at), verifies types match schema files in app/schema/, and validates property names and types.', inputSchema: { diff --git a/package-lock.json b/package-lock.json index 886e1db4e..e303b0b80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@platformos/pos-cli", - "version": "6.0.3", + "version": "6.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@platformos/pos-cli", - "version": "6.0.3", + "version": "6.0.4", "bundleDependencies": [ "commander", "degit", diff --git a/package.json b/package.json index 5e7c17428..5099935fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@platformos/pos-cli", - "version": "6.0.3", + "version": "6.0.4", "description": "Manage your platformOS application", "type": "module", "imports": { diff --git a/test/integration/deploy.test.js b/test/integration/deploy.test.js index 6df351459..7de48b5f0 100644 --- a/test/integration/deploy.test.js +++ b/test/integration/deploy.test.js @@ -141,7 +141,7 @@ describe('Server errors', () => { test('Error in model', async () => { const { stderr } = await run('incorrect_model'); expect(stderr).toMatch( - 'Validation failed: Attribute type `foo` is not allowed. Valid attribute types: string, integer, float, decimal, datetime, time, date, binary, boolean, array, address, file, photo, text, geojson, upload' + 'Attribute type `foo` is not allowed. Valid attribute types: string, integer, float, decimal, datetime, time, date, binary, boolean, array, address, file, photo, text, geojson, upload' ); });