Skip to content

Commit eab1ae3

Browse files
MEFRREEXMEFRREEX
authored
Merge pull request #1 from DensyDev/feat/change-branding
feat: change branding
2 parents 486b4e7 + 17ccc7e commit eab1ae3

8 files changed

Lines changed: 156 additions & 143 deletions

File tree

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2025 Instancify
3+
Copyright (c) 2026 Densy Development
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Scriptify TypeScript
2-
Adds TypeScript support to Scriptify. Uses ready-made implementations of [script-js-graalvm](https://github.com/Instancify/Scriptify/tree/master/script-js-graalvm) and [script-js-rhino](https://github.com/Instancify/Scriptify/tree/master/script-js-rhino), and transcompiles TypeScript using [swc4j](https://github.com/caoccao/swc4j) for evaluation.
2+
Adds TypeScript support to Scriptify. Uses ready-made implementations of [script-js-graalvm](https://github.com/DensyDev/Scriptify/tree/master/script-js-graalvm) and [script-js-rhino](https://github.com/DensyDev/Scriptify/tree/master/script-js-rhino), and transcompiles TypeScript using [swc4j](https://github.com/caoccao/swc4j) for evaluation.
33

44
## TAKE NOTE
55
> [!WARNING]
@@ -20,20 +20,20 @@ List of all dependencies:
2020
**https://github.com/caoccao/swc4j?tab=readme-ov-file#dependency**
2121

2222
## Maven
23-
Adding repo:
23+
Adding repository:
2424
```xml
2525
<repositories>
2626
<repository>
27-
<id>instancify-repository-snapshots</id>
28-
<url>https://repo.instancify.app/snapshots</url>
27+
<id>densy-repository-snapshots</id>
28+
<url>https://repo.densy.org/snapshots</url>
2929
</repository>
3030
</repositories>
3131
```
3232

3333
For adding a library for GraalVM (SWC):
3434
```xml
3535
<dependency>
36-
<groupId>com.instancify.scriptify.ts</groupId>
36+
<groupId>org.densy.scriptify.ts</groupId>
3737
<artifactId>script-ts-swc-graalvm</artifactId>
3838
<version>1.0.0-SNAPSHOT</version>
3939
</dependency>
@@ -42,27 +42,27 @@ For adding a library for GraalVM (SWC):
4242
For adding a library for Rhino (SWC):
4343
```xml
4444
<dependency>
45-
<groupId>com.instancify.scriptify.ts</groupId>
45+
<groupId>org.densy.scriptify.ts</groupId>
4646
<artifactId>script-ts-swc-rhino</artifactId>
4747
<version>1.0.0-SNAPSHOT</version>
4848
</dependency>
4949
```
5050

5151
## Gradle
52-
Adding repo:
52+
Adding repository:
5353
```groovy
5454
maven {
55-
name "instancifyRepositorySnapshots"
56-
url "https://repo.instancify.app/snapshots"
55+
name "densyRepositorySnapshots"
56+
url "https://repo.densy.org/snapshots"
5757
}
5858
```
5959

6060
For adding a library for GraalVM (SWC):
6161
```groovy
62-
implementation "com.instancify.scriptify.ts:script-ts-swc-graalvm:1.0.0-SNAPSHOT"
62+
implementation "org.densy.scriptify.ts:script-ts-swc-graalvm:1.0.0-SNAPSHOT"
6363
```
6464

6565
For adding a library for Rhino (SWC):
6666
```groovy
67-
implementation "com.instancify.scriptify.ts:script-ts-swc-rhino:1.0.0-SNAPSHOT"
67+
implementation "org.densy.scriptify.ts:script-ts-swc-rhino:1.0.0-SNAPSHOT"
6868
```

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ java {
1111
}
1212

1313
allprojects {
14-
group = "com.instancify.scriptify.ts"
14+
group = "org.densy.scriptify.ts"
1515
version = "1.0.0-SNAPSHOT"
1616
}
1717

@@ -23,7 +23,7 @@ subprojects {
2323

2424
repositories {
2525
mavenCentral()
26-
maven("https://repo.instancify.app/snapshots")
26+
maven("https://repo.densy.org/snapshots")
2727
}
2828

2929
publishing {
@@ -37,8 +37,8 @@ subprojects {
3737
}
3838
repositories {
3939
maven {
40-
name = "instancify"
41-
url = uri("https://repo.instancify.app/snapshots")
40+
name = "densy"
41+
url = uri("https://repo.densy.org/snapshots")
4242
credentials {
4343
username = System.getenv("MAVEN_USERNAME")
4444
password = System.getenv("MAVEN_PASSWORD")

‎script-ts-swc-graalvm/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ repositories {
77
}
88

99
dependencies {
10-
api("com.instancify.scriptify:script-js-graalvm:1.4.4-SNAPSHOT")
10+
api("org.densy.scriptify:script-js-graalvm:1.5.0-SNAPSHOT")
1111
api("com.caoccao.javet:swc4j:1.6.0")
1212
}

script-ts-swc-graalvm/src/main/java/com/instancify/scriptify/ts/swc/graalvm/script/TsScript.java renamed to script-ts-swc-graalvm/src/main/java/org/densy/scriptify/ts/swc/graalvm/script/TsScript.java

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
package com.instancify.scriptify.ts.swc.graalvm.script;
1+
package org.densy.scriptify.ts.swc.graalvm.script;
22

33
import com.caoccao.javet.swc4j.Swc4j;
44
import com.caoccao.javet.swc4j.enums.Swc4jMediaType;
55
import com.caoccao.javet.swc4j.options.Swc4jTranspileOptions;
66
import com.caoccao.javet.swc4j.outputs.Swc4jTranspileOutput;
7-
import com.instancify.scriptify.api.exception.ScriptException;
8-
import com.instancify.scriptify.api.script.Script;
9-
import com.instancify.scriptify.api.script.ScriptObject;
10-
import com.instancify.scriptify.api.script.constant.ScriptConstant;
11-
import com.instancify.scriptify.api.script.constant.ScriptConstantManager;
12-
import com.instancify.scriptify.api.script.function.ScriptFunctionManager;
13-
import com.instancify.scriptify.api.script.function.definition.ScriptFunctionDefinition;
14-
import com.instancify.scriptify.api.script.security.ScriptSecurityManager;
15-
import com.instancify.scriptify.core.script.constant.StandardConstantManager;
16-
import com.instancify.scriptify.core.script.function.StandardFunctionManager;
17-
import com.instancify.scriptify.core.script.security.StandardSecurityManager;
18-
import com.instancify.scriptify.js.graalvm.script.JsFunction;
19-
import com.instancify.scriptify.js.graalvm.script.JsSecurityClassAccessor;
7+
import org.densy.scriptify.api.exception.ScriptException;
8+
import org.densy.scriptify.api.script.CompiledScript;
9+
import org.densy.scriptify.api.script.Script;
10+
import org.densy.scriptify.api.script.ScriptObject;
11+
import org.densy.scriptify.api.script.constant.ScriptConstant;
12+
import org.densy.scriptify.api.script.constant.ScriptConstantManager;
13+
import org.densy.scriptify.api.script.function.ScriptFunctionManager;
14+
import org.densy.scriptify.api.script.function.definition.ScriptFunctionDefinition;
15+
import org.densy.scriptify.api.script.security.ScriptSecurityManager;
16+
import org.densy.scriptify.core.script.constant.StandardConstantManager;
17+
import org.densy.scriptify.core.script.function.StandardFunctionManager;
18+
import org.densy.scriptify.core.script.security.StandardSecurityManager;
19+
import org.densy.scriptify.js.graalvm.script.JsCompiledScript;
20+
import org.densy.scriptify.js.graalvm.script.JsFunction;
21+
import org.densy.scriptify.js.graalvm.script.JsSecurityClassAccessor;
2022
import org.graalvm.polyglot.Context;
2123
import org.graalvm.polyglot.HostAccess;
2224
import org.graalvm.polyglot.Value;
@@ -31,6 +33,7 @@ public class TsScript implements Script<Value> {
3133
private ScriptFunctionManager functionManager = new StandardFunctionManager();
3234
private ScriptConstantManager constantManager = new StandardConstantManager();
3335
private final List<String> extraScript = new ArrayList<>();
36+
private final Swc4j swc = new Swc4j();
3437

3538
@Override
3639
public ScriptConstantManager getConstantManager() {
@@ -63,7 +66,7 @@ public void addExtraScript(String script) {
6366
}
6467

6568
@Override
66-
public Value eval(String script) throws ScriptException {
69+
public CompiledScript<Value> compile(String script) throws ScriptException {
6770
Context.Builder builder = Context.newBuilder("js")
6871
.allowHostAccess(HostAccess.newBuilder(HostAccess.ALL)
6972
// Mapping for the ScriptObject class required
@@ -105,14 +108,18 @@ public Value eval(String script) throws ScriptException {
105108

106109
try {
107110
// Transpile TypeScript to JavaScript and evaluate it
108-
Swc4j swc = new Swc4j();
109111
Swc4jTranspileOptions options = new Swc4jTranspileOptions().setMediaType(Swc4jMediaType.TypeScript);
110112
Swc4jTranspileOutput output = swc.transpile(fullScript.toString(), options);
111-
return context.eval("js", output.getCode());
113+
return new JsCompiledScript(context, context.eval("js", output.getCode()));
112114
} catch (Exception e) {
113115
throw new ScriptException(e);
114-
} finally {
115-
context.close();
116+
}
117+
}
118+
119+
@Override
120+
public Value evalOneShot(String script) throws ScriptException {
121+
try (CompiledScript<Value> compiled = compile(script)) {
122+
return compiled.get();
116123
}
117124
}
118125
}

‎script-ts-swc-rhino/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ repositories {
77
}
88

99
dependencies {
10-
api("com.instancify.scriptify:script-js-rhino:1.4.4-SNAPSHOT")
10+
api("org.densy.scriptify:script-js-rhino:1.5.0-SNAPSHOT")
1111
api("com.caoccao.javet:swc4j:1.6.0")
1212
}

‎script-ts-swc-rhino/src/main/java/com/instancify/scriptify/ts/swc/rhino/script/TsScript.java‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)