From 9a1ba5fedfdb9e98c6a45518392f6425ce7053a1 Mon Sep 17 00:00:00 2001 From: Jake O'Shannessy Date: Sat, 22 Jun 2024 17:13:39 +0100 Subject: [PATCH] Update deps (v0.1.10) --- deno.json | 2 +- deno.lock | 62 +++++++------------------------------------------------ main.ts | 39 ++++++++++++++++------------------ 3 files changed, 26 insertions(+), 77 deletions(-) diff --git a/deno.json b/deno.json index 7aae9fe..866814c 100644 --- a/deno.json +++ b/deno.json @@ -1,6 +1,6 @@ { "name": "@smoke-cloud/fds-inspect-cli", - "version": "0.1.7", + "version": "0.1.10", "exports": "./main.ts", "tasks": { "dev": "deno run --watch main.ts" diff --git a/deno.lock b/deno.lock index 7627090..00962e2 100644 --- a/deno.lock +++ b/deno.lock @@ -5,18 +5,14 @@ "jsr:@cliffy/command@1.0.0-rc.4": "jsr:@cliffy/command@1.0.0-rc.4", "jsr:@cliffy/flags@1.0.0-rc.4": "jsr:@cliffy/flags@1.0.0-rc.4", "jsr:@cliffy/table@1.0.0-rc.4": "jsr:@cliffy/table@1.0.0-rc.4", - "jsr:@smoke-cloud/fds-inspect-core@0.1.3": "jsr:@smoke-cloud/fds-inspect-core@0.1.3", - "jsr:@smoke-cloud/fds-inspect-core@0.1.6": "jsr:@smoke-cloud/fds-inspect-core@0.1.6", - "jsr:@smoke-cloud/fds-inspect-core@0.1.7": "jsr:@smoke-cloud/fds-inspect-core@0.1.7", - "jsr:@smoke-cloud/fds-inspect-core@0.1.8": "jsr:@smoke-cloud/fds-inspect-core@0.1.8", - "jsr:@smoke-cloud/fds-inspect@0.1.7": "jsr:@smoke-cloud/fds-inspect@0.1.7", + "jsr:@smoke-cloud/fds-inspect-core@0.1.10": "jsr:@smoke-cloud/fds-inspect-core@0.1.10", + "jsr:@smoke-cloud/fds-inspect@0.1.10": "jsr:@smoke-cloud/fds-inspect@0.1.10", "jsr:@std/assert@^0.221.0": "jsr:@std/assert@0.221.0", "jsr:@std/assert@^0.226.0": "jsr:@std/assert@0.226.0", "jsr:@std/console@0.221": "jsr:@std/console@0.221.0", "jsr:@std/fmt@0.221": "jsr:@std/fmt@0.221.0", "jsr:@std/path@0.225.2": "jsr:@std/path@0.225.2", - "jsr:@std/text@0.221": "jsr:@std/text@0.221.0", - "npm:handlebars@4.7.8": "npm:handlebars@4.7.8" + "jsr:@std/text@0.221": "jsr:@std/text@0.221.0" }, "jsr": { "@cliffy/command@1.0.0-rc.4": { @@ -37,23 +33,11 @@ "jsr:@std/console@0.221" ] }, - "@smoke-cloud/fds-inspect-core@0.1.3": { - "integrity": "a90433f1f1ffafd6db24464c0a7764858258880a1417a61cd953d00cf6925cb1" + "@smoke-cloud/fds-inspect-core@0.1.10": { + "integrity": "fe7c189eef3e41da57592d7d4290707e98706589dc2d62ca6ca45bc96ef7e827" }, - "@smoke-cloud/fds-inspect-core@0.1.6": { - "integrity": "f014a12eb041de3a434ff756611fc3dedeaee1b329d931ba9325b3417b172a1d" - }, - "@smoke-cloud/fds-inspect-core@0.1.7": { - "integrity": "2599811a229357cdbfd062387feed9ea6ef79f7b0ff8e5a99b792f97a9c044e7" - }, - "@smoke-cloud/fds-inspect-core@0.1.8": { - "integrity": "2bce8c455afff3cb1d3a126cddb3d4c977303a088abe4a31ccec30d7cb24e1eb" - }, - "@smoke-cloud/fds-inspect@0.1.7": { - "integrity": "6ddab00ff70df7433f9452505d56235d380afe4375d5ed4c1220ccb4064661cd", - "dependencies": [ - "jsr:@smoke-cloud/fds-inspect-core@0.1.7" - ] + "@smoke-cloud/fds-inspect@0.1.10": { + "integrity": "995745fd4dab4e090a5d245c8e8e61296cc9196585a227dbe1b1724fd77488e3" }, "@std/assert@0.221.0": { "integrity": "a5f1aa6e7909dbea271754fd4ab3f4e687aeff4873b4cef9a320af813adb489a" @@ -79,38 +63,6 @@ "jsr:@std/assert@^0.221.0" ] } - }, - "npm": { - "handlebars@4.7.8": { - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", - "dependencies": { - "minimist": "minimist@1.2.8", - "neo-async": "neo-async@2.6.2", - "source-map": "source-map@0.6.1", - "uglify-js": "uglify-js@3.18.0", - "wordwrap": "wordwrap@1.0.0" - } - }, - "minimist@1.2.8": { - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dependencies": {} - }, - "neo-async@2.6.2": { - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dependencies": {} - }, - "source-map@0.6.1": { - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dependencies": {} - }, - "uglify-js@3.18.0": { - "integrity": "sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==", - "dependencies": {} - }, - "wordwrap@1.0.0": { - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "dependencies": {} - } } }, "remote": {} diff --git a/main.ts b/main.ts index c56ceee..f48a95d 100644 --- a/main.ts +++ b/main.ts @@ -1,16 +1,7 @@ -import { - type FdsFile, - verifyInput, -} from "jsr:@smoke-cloud/fds-inspect-core@0.1.8"; -import * as fdsInspect from "jsr:@smoke-cloud/fds-inspect-core@0.1.8"; +import * as fdsInspectCore from "jsr:@smoke-cloud/fds-inspect-core@0.1.10"; +import * as fdsInspect from "jsr:@smoke-cloud/fds-inspect@0.1.10"; import { Command } from "jsr:@cliffy/command@1.0.0-rc.4"; import { open } from "./open.ts"; -import { - getJson, - getJsonTemp, - renderTypstPdf, - renderVerificationTypst, -} from "jsr:@smoke-cloud/fds-inspect@0.1.7"; await new Command() .name("tway-server-manager") @@ -28,10 +19,10 @@ await new Command() .command("count-cells", "Count the total number of cells") // .option("-f, --foo", "Foo option.") .arguments("") - .action(async (_options, ...args) => { - const fdsFile = await getJson(args[0]); - const nCells = fdsInspect.summary.countCells(fdsFile); - console.log(nCells); + .action(async () => { + // const fdsData = await getJsonTemp(args[0]); + // const nCells = fdsInspect.summary.countCells(fdsData); + // console.log(nCells); }) // Get Threadway Send .command("meshes", "Display information on each mesh") @@ -130,16 +121,22 @@ await new Command() .arguments("") .action(async (_options, ...args) => { const inputPath = args[0]; - const fdsFile: FdsFile = await getJsonTemp(inputPath); - const verificationSummary = verifyInput(fdsFile); - const inputSummary = fdsInspect.summary.summarise_input(fdsFile); - const typst = renderVerificationTypst(inputSummary, verificationSummary); + const fdsData = await fdsInspect.getJsonTemp(inputPath); + const verificationSummary = fdsInspectCore.verifyInput( + fdsData, + fdsInspectCore.stdTestList, + ); + const inputSummary = fdsInspectCore.summary.summarise_input(fdsData); + const typst = fdsInspect.renderVerificationTypst( + inputSummary, + verificationSummary, + ); const tempFile = await Deno.makeTempFile({ - prefix: fdsFile.chid, + prefix: fdsData.chid, suffix: "_Verification.pdf", }); try { - await renderTypstPdf(tempFile, typst); + await fdsInspect.renderTypstPdf(tempFile, typst); await open(tempFile); } catch (e) { console.error(e.message);