diff --git a/package-lock.json b/package-lock.json index ab48b01..937e65d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rbxts/zircon", - "version": "0.7.0-alpha.0", + "version": "0.8.0-alpha.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -145,9 +145,9 @@ "integrity": "sha512-JtTtGdJwETLUpaHH8S9zi/pV39i5rI2DhSXDLAOZ21KP/6IEMMPAcDtEbDBFVF3fXpsChyNcFq+9vM2qGzA7ug==" }, "@rbxts/rust-classes": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@rbxts/rust-classes/-/rust-classes-0.3.1.tgz", - "integrity": "sha512-0NG4EpD67JxhfY5vbjsULjU1QvyzLq/5RJTbFHlRimaVtUdpGXOyWvv4wO1eOtQVLVDV/DAG9tJB6dyo0I59pQ==" + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@rbxts/rust-classes/-/rust-classes-0.10.0.tgz", + "integrity": "sha512-U2YhOLG9dDwVOmMTgjzGcoM2yk0mcJ/Y6Fmu6RUVM2y9XHGly6bWsjK7o3uaI4CDMfYZNKF2MkELIBeyFyEJ2Q==" }, "@rbxts/services": { "version": "1.1.1", @@ -183,20 +183,11 @@ "integrity": "sha512-HXKy2GgQk2TeV6gr2IRdh3RrhMu1z2sCnzMPYiTa9sMM2EwY7BPVeEAbOkWa19rDI8yDWH1MRUMEP4RjSBbbzA==" }, "@rbxts/zirconium": { - "version": "1.0.1-rc.0", - "resolved": "https://registry.npmjs.org/@rbxts/zirconium/-/zirconium-1.0.1-rc.0.tgz", - "integrity": "sha512-Z6L3cCEB8IkhSpr1M6Eys8wOkQDRg1uPgTFstZxgNq+3KHIYsJjwISi62aSfSxL5jMrrR9uvQB5+pLoqYmaJ4w==", + "version": "1.0.2-rc.0", + "resolved": "https://registry.npmjs.org/@rbxts/zirconium/-/zirconium-1.0.2-rc.0.tgz", + "integrity": "sha512-8q/UtJhACFYQc/WsyaeAVZOZaAShW747S3zVTf7qabp/BOzyg3ZCilYpGhuyQr61mlYhtPefF9PtAMTZW33ziw==", "requires": { - "@rbxts/net": "^1.3.0-beta", - "@rbxts/rust-classes": "^0.3.1", - "@rbxts/t": "^1.3.1" - }, - "dependencies": { - "@rbxts/net": { - "version": "1.3.0-beta.6.2", - "resolved": "https://registry.npmjs.org/@rbxts/net/-/net-1.3.0-beta.6.2.tgz", - "integrity": "sha512-msEvN1nadD3Xw3ntncc+6+x5NZU63pF85pGKiyAZqTFInQeVOawqVxGbVFYllmabnBATFeZ4Pku2m7xEzHKfpA==" - } + "@rbxts/rust-classes": "^0.10.0" } }, "@types/json-schema": { diff --git a/package.json b/package.json index 9a18282..79aa7cb 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,6 @@ "@rbxts/snapdragon": "^2.0.0-beta.0", "@rbxts/string-utils": "^1.0.2", "@rbxts/t": "^1.3.5", - "@rbxts/zirconium": "^1.0.1-rc.0" + "@rbxts/zirconium": "^1.0.2-rc.0" } } diff --git a/src/BuiltIn/Print.ts b/src/BuiltIn/Print.ts index afcfbed..82077c1 100644 --- a/src/BuiltIn/Print.ts +++ b/src/BuiltIn/Print.ts @@ -1,9 +1,9 @@ import { LogLevel } from "@rbxts/log"; import { RunService } from "@rbxts/services"; import { ZirconFunctionBuilder } from "Class/ZirconFunctionBuilder"; -import { Server } from "index"; +import Server from "../Server"; -const ZirconPrint = new ZirconFunctionBuilder("print").Bind((_, ...args) => { +const ZirconPrint = new ZirconFunctionBuilder("print").AddVaradicArgument("unknown").Bind((_, ...args) => { if (RunService.IsServer()) { Server.Log.WriteStructured({ Template: "{PrintData}", diff --git a/src/Class/ZirconFunction.ts b/src/Class/ZirconFunction.ts index 11f8eb1..9d58eb7 100644 --- a/src/Class/ZirconFunction.ts +++ b/src/Class/ZirconFunction.ts @@ -3,7 +3,7 @@ import { RunService } from "@rbxts/services"; import ZrContext from "@rbxts/zirconium/out/Data/Context"; import ZrLuauFunction, { ZrLuauArgument } from "@rbxts/zirconium/out/Data/LuauFunction"; import ZrPlayerScriptContext from "@rbxts/zirconium/out/Runtime/PlayerScriptContext"; -import { Server } from "index"; +import Server from "../Server"; import { ZirconFunctionBuilder } from "./ZirconFunctionBuilder"; import { InferArguments, Validator, ZirconValidator } from "./ZirconTypeValidator"; diff --git a/src/Class/ZirconFunctionBuilder.ts b/src/Class/ZirconFunctionBuilder.ts index d3f9400..00d7359 100644 --- a/src/Class/ZirconFunctionBuilder.ts +++ b/src/Class/ZirconFunctionBuilder.ts @@ -34,12 +34,6 @@ export class ZirconFunctionBuilder[] = []> { return (this as unknown) as ZirconFunctionBuilder<[...V, ...InferValidators]>; } - public AddArgument(type: TValidation) { - return (this as unknown) as ZirconFunctionBuilder<[...V, ...InferValidator[]]>; - } - - public AddOptionalArgument(type: TValidation) {} - /** @internal */ public AddVaradicArgument(arg: TValidation) { this.hasVaradic = true; @@ -54,5 +48,3 @@ export class ZirconFunctionBuilder[] = []> { return new ZirconFunction(this.name, this.validators as V, fn); } } - -new ZirconFunctionBuilder("test").AddArguments("player", "object", "unknown").Bind((context, pl, obj, val) => {}); diff --git a/src/index.ts b/src/index.ts index 41de5c6..4d9e81b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -34,4 +34,4 @@ namespace Zircon { export type Value = ZrValue; } -export = Zircon; +export default Zircon;